Fix DATE problem and minor compile stuff

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@344 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 099738940a181d2480da5ad98eacf05b6c378faf..4a97c54dcbf287704a96a57dca0f96ee21cf57c8 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -23,7 +23,7 @@ AC_CANONICAL_HOST
 
 dnl bacula version
 VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
-DATE=`sed -n -e 's/^.*[ \t]*DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
+DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 LSMDATE=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 AC_SUBST(VERSION)dnl 
 AC_SUBST(DATE)dnl 

diff --git a/bacula/configure b/bacula/configure
index 1e4884a7d552f084f890ccb662e416d95a0c4c16..2c1993d514124dd0be4818284d1b37ee735db512 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -735,7 +735,7 @@ echo "$ac_t""$host" 1>&6
 
 
 VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
-DATE=`sed -n -e 's/^.* \t*DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
+DATE=`sed -n -e 's/^.* \t*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 LSMDATE=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 echo "configuring for bacula $VERSION ($DATE)"
 

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 6ae97e66fc28fe78f5c41e8762e0fcfa0017395a..2fd86cfbb49247db621e4cccb605c73a5632fd5c 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -60,7 +60,7 @@ static int stop = FALSE;
 static void usage()
 {
    fprintf(stderr,
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: console [-s] [-c config_file] [-d debug_level] [config_file]\n"
 "       -c <file>   set configuration file to file\n"
 "       -dnn        set debug level to nn\n"

diff --git a/bacula/src/dird/authenticate.c b/bacula/src/dird/authenticate.c
index 1b251797b3a83b9956aa3ab0c9b7f7638acb386f..3d1db7e03fcfb39e8e3025c901b1c3a770362e50 100644 (file)
--- a/bacula/src/dird/authenticate.c
+++ b/bacula/src/dird/authenticate.c
@@ -145,6 +145,6 @@ int authenticate_user_agent(BSOCK *ua)
       sleep(5);
       return 0;
    }
-   bnet_fsend(ua, "1000 OK: %s Version: " VERSION " (" DATE ")\n", my_name);
+   bnet_fsend(ua, "1000 OK: %s Version: " VERSION " (" BDATE ")\n", my_name);
    return 1;
 }

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 82300cb7e18af639c5126f6d0a632222e58e6f26..eb4a519aa139fb2f604db527aab0fd4fe5405d4a 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -61,7 +61,7 @@ int SDConnectTimeout;
 static void usage()
 {
    fprintf(stderr, _(
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
 "       -c <file>   set configuration file to file\n"
 "       -dnn        set debug level to nn\n"

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index b79246e281140abd08cd2478ecf0ee6e10f2f903..e4bb83dddfb68d9a5306fc3d6127b5ce2523b9bb 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -1483,7 +1483,7 @@ static int helpcmd(UAContext *ua, char *cmd)
 
 static int versioncmd(UAContext *ua, char *cmd)
 {
-   bsendmsg(ua, "%s Version: " VERSION " (" DATE ")\n", my_name);
+   bsendmsg(ua, "%s Version: " VERSION " (" BDATE ")\n", my_name);
    return 1;
 }
 

diff --git a/bacula/src/dird/ua_select.c b/bacula/src/dird/ua_select.c
index 16b668233c99529bfe08cecc2d59f6f2dcab9ea3..4675efeb706268488f4cbcb9616e9b4c9ada9f5c 100644 (file)
--- a/bacula/src/dird/ua_select.c
+++ b/bacula/src/dird/ua_select.c
@@ -481,6 +481,7 @@ POOL *select_pool_resource(UAContext *ua)
    UnlockRes();
    do_prompt(ua, _("Select Pool resource"), name, sizeof(name));
    pool = (POOL *)GetResWithName(R_POOL, name);
+   return pool;
 }
 
 
@@ -492,7 +493,6 @@ POOL *select_pool_resource(UAContext *ua)
 POOL *get_pool_resource(UAContext *ua)
 {
    POOL *pool = NULL;
-   char name[MAX_NAME_LENGTH];
    int i;
    
    for (i=1; i<ua->argc; i++) {

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index a01ac3806f81ec65ee886c2042c7de1edfb396df..34f551565ff655a4c1c8ae2989fe9759454e96c9 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -198,7 +198,7 @@ static void do_director_status(UAContext *ua, char *cmd)
    int pool_mem = FALSE;
 
    Dmsg0(200, "Doing status\n");
-   bsendmsg(ua, "%s Version: " VERSION " (" DATE ")\n", my_name);
+   bsendmsg(ua, "%s Version: " VERSION " (" BDATE ")\n", my_name);
    bstrftime(dt, sizeof(dt), daemon_start_time);
    bsendmsg(ua, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
         last_job.NumJobs == 1 ? "" : "s");

diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index 414e621f9b9e6f411691838fe3daa648039bc0fb..2706573633c2f302fea09ccb0ea3d5f0a50d7fb5 100644 (file)
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -57,7 +57,7 @@ CLIENT *me;                         /* my resource */
 static void usage()
 {
    fprintf(stderr, _(
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: filed [-f -s] [-c config_file] [-d debug_level] [config_file]\n"  
 "        -c <file>   use <file> as configuration file\n"
 "        -dnn        set debug level to nn\n"

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index dcb52767a1b5e0e1a3ec7ba4e1a738ce398c2935..6bc287862b521818e094979e0bf11658cd94ed39 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -46,7 +46,7 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
 
    msg = (char *)get_pool_memory(PM_MESSAGE);
    found = 0;
-   len = Mmsg(&msg, "%s Version: " VERSION " (" DATE ")\n", my_name);
+   len = Mmsg(&msg, "%s Version: " VERSION " (" BDATE ")\n", my_name);
    sendit(msg, len, arg);
    bstrftime(dt, sizeof(dt), daemon_start_time);
    len = Mmsg(&msg, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
@@ -97,9 +97,9 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
           edit_uint64_with_commas(njcr->num_files_examined, b1));
       sendit(msg, len, arg);
       if (njcr->JobFiles > 0) {
-         P(njcr->mutex);
+        P(njcr->mutex);
          len = Mmsg(&msg, _("    Processing file: %s\n"), njcr->last_fname);
-         V(njcr->mutex);
+        V(njcr->mutex);
         sendit(msg, len, arg);
       }
 

diff --git a/bacula/src/stored/bcopy.c b/bacula/src/stored/bcopy.c
index 5dded6d184262e3d13530e6c54934780ad898e84..a8057eea54a89c61166d9b1a1a4d788bf77a2b29 100644 (file)
--- a/bacula/src/stored/bcopy.c
+++ b/bacula/src/stored/bcopy.c
@@ -54,7 +54,7 @@ char *configfile;
 static void usage()
 {
    fprintf(stderr, _(
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: bcopy [-d debug_level] <input-archive> <output-archive>\n"
 "       -b bootstrap      specify a bootstrap file\n"
 "       -c <file>         specify configuration file\n"

diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index 10c6300cca2aeb893d92f74007ae754ff447efde..645c11bdabc4c629a2bcea3fbffaee77bae6c3a4 100644 (file)
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -75,7 +75,7 @@ char *configfile;
 static void usage()
 {
    fprintf(stderr,
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: bextract [-d debug_level] <bacula-archive> <directory-to-store-files>\n"
 "       -b <file>       specify a bootstrap file\n"
 "       -c <file>       specify a configuration file\n"

diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c
index 3d00ea70c14cf28710873c4fbd0215aa926eb99d..6c2ec78ca92c95cfac68762a5648fc94856efb45 100644 (file)
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -58,7 +58,7 @@ static BSR *bsr = NULL;
 static void usage()
 {
    fprintf(stderr,
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: bls [-d debug_level] <physical-device-name>\n"
 "       -b <file>       specify a bootstrap file\n"
 "       -c <file>       specify a config file\n"

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index 9ccdc3fab9c40277ccf6209ee7ff0c7178a8a68a..05f8a7ce2d0b7951b3880267478ad7ef14fe1647 100644 (file)
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -95,7 +95,7 @@ char *configfile;
 static void usage()
 {
    fprintf(stderr, _(
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: bscan [-d debug_level] <bacula-archive>\n"
 "       -b bootstrap      specify a bootstrap file\n"
 "       -c <file>         specify configuration file\n"

diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c
index 94780827b91976d67dc8d3c5b68db4d4c7258437..8bac101d7ccb1925ce718e5afd8c8ee06f001be9 100644 (file)
--- a/bacula/src/stored/btape.c
+++ b/bacula/src/stored/btape.c
@@ -1493,7 +1493,7 @@ static void helpcmd()
 static void usage()
 {
    fprintf(stderr, _(
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: btape [-c config_file] [-d debug_level] [device_name]\n"
 "       -c <file>   set configuration file to file\n"
 "       -dnn        set debug level to nn\n"

diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c
index 4e49725dae35650ea118a182c9b4a5935fca05a6..92182bd9cb6d0ed8ef033360d511bb4aef3874d1 100644 (file)
--- a/bacula/src/stored/dircmd.c
+++ b/bacula/src/stored/dircmd.c
@@ -626,7 +626,7 @@ static int status_cmd(JCR *jcr)
    char dt[MAX_TIME_LENGTH];
    char b1[30], b2[30], b3[30];
 
-   bnet_fsend(user, "\n%s Version: " VERSION " (" DATE ")\n", my_name);
+   bnet_fsend(user, "\n%s Version: " VERSION " (" BDATE ")\n", my_name);
    bstrftime(dt, sizeof(dt), daemon_start_time);
    bnet_fsend(user, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
         last_job.NumJobs == 1 ? "" : "s");

diff --git a/bacula/src/stored/label.c b/bacula/src/stored/label.c
index 87feb01013b3e6a4d150a446eae0a6c971816054..e23c5062a6b4b182e13a0e57a24d217b7d922f4b 100644 (file)
--- a/bacula/src/stored/label.c
+++ b/bacula/src/stored/label.c
@@ -358,7 +358,7 @@ void create_volume_label(DEVICE *dev, char *VolName)
       dev->VolHdr.HostName[0] = 0;
    }
    bstrncpy(dev->VolHdr.LabelProg, my_name, sizeof(dev->VolHdr.LabelProg));
-   sprintf(dev->VolHdr.ProgVersion, "Ver. %s %s", VERSION, DATE);
+   sprintf(dev->VolHdr.ProgVersion, "Ver. %s %s", VERSION, BDATE);
    sprintf(dev->VolHdr.ProgDate, "Build %s %s", __DATE__, __TIME__);
    dev->state |= ST_LABEL;           /* set has Bacula label */
    if (debug_level >= 90) {

diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
index 6abd69bf5edd0de6b90563336acfd821adb9910f..cb13bf31074c1fabc4457b6741c8a0c27d30eac8 100644 (file)
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -62,7 +62,7 @@ static workq_t dird_workq;          /* queue for processing connections */
 static void usage()
 {
    fprintf(stderr, _(
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: stored [-s -f ] [-c config_file] [-d debug_level]  [config_file]\n"
 "        -c <file>   use <file> as configuration file\n"
 "        -dnn        set debug level to nn\n"

diff --git a/bacula/src/version.h b/bacula/src/version.h
index d5bc8ddc542c683343f2350adae052d60df93668..15cb61fc2150a6c48099dba40218c080c18869c9 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,7 +1,7 @@
 /* */
 #define VERSION "1.30"
 #define VSTRING "1"
-#define DATE    "11 February 2003"
+#define BDATE   "11 February 2003"
 #define LSMDATE "11Feb03"
 
 /* Debug flags */