From: Kern Sibbald Date: Tue, 11 Feb 2003 20:29:25 +0000 (+0000) Subject: Fix DATE problem and minor compile stuff X-Git-Tag: Release-1.30~123 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cba7616fed3c9020a940a0bb0aee2d14f705db37;p=bacula%2Fbacula 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 099738940a..4a97c54dcb 100644 --- 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 1e4884a7d5..2c1993d514 100755 --- 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 6ae97e66fc..2fd86cfbb4 100644 --- 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 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 1b251797b3..3d1db7e03f 100644 --- 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 82300cb7e1..eb4a519aa1 100644 --- 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 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 b79246e281..e4bb83dddf 100644 --- 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 16b668233c..4675efeb70 100644 --- 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; iargc; i++) { diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c index a01ac3806f..34f551565f 100644 --- 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 414e621f9b..2706573633 100644 --- 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 use 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 dcb52767a1..6bc287862b 100755 --- 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 5dded6d184..a8057eea54 100644 --- 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] \n" " -b bootstrap specify a bootstrap file\n" " -c specify configuration file\n" diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c index 10c6300cca..645c11bdab 100644 --- 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] \n" " -b specify a bootstrap file\n" " -c specify a configuration file\n" diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c index 3d00ea70c1..6c2ec78ca9 100644 --- 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] \n" " -b specify a bootstrap file\n" " -c specify a config file\n" diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c index 9ccdc3fab9..05f8a7ce2d 100644 --- 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] \n" " -b bootstrap specify a bootstrap file\n" " -c specify configuration file\n" diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c index 94780827b9..8bac101d7c 100644 --- 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 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 4e49725dae..92182bd9cb 100644 --- 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 87feb01013..e23c5062a6 100644 --- 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 6abd69bf5e..cb13bf3107 100644 --- 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 use as configuration file\n" " -dnn set debug level to nn\n" diff --git a/bacula/src/version.h b/bacula/src/version.h index d5bc8ddc54..15cb61fc21 100644 --- 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 */