X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Fgenversion.c;h=e9680b33a4de355c495d282fbd50433f3e512643;hb=HEAD;hp=21243b96fcb9c6d14f71aaff728f6fc98a888a5a;hpb=cdbbeef9cde260e429854dd313bc0bf7560e1e24;p=debian%2Famanda diff --git a/common-src/genversion.c b/common-src/genversion.c index 21243b9..e9680b3 100644 --- a/common-src/genversion.c +++ b/common-src/genversion.c @@ -1,6 +1,7 @@ /* * Amanda, The Advanced Maryland Automatic Network Disk Archiver * Copyright (c) 1991-1999 University of Maryland at College Park + * Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved. * All Rights Reserved. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -24,12 +25,16 @@ * file named AUTHORS, in the root directory of this distribution. */ /* - * $Id: genversion.c,v 1.36 2006/07/13 03:22:20 paddy_s Exp $ + * $Id: genversion.c 4946 2012-10-18 11:15:16Z martinea $ * * dump the current Amanda version info */ #include "amanda.h" -#include "version.h" + +/* distribution-time information */ +#include "svn-info.h" + +/* build-time information */ #include "genversion.h" #define LMARGIN 6 @@ -37,8 +42,8 @@ static size_t linelen; -#define startline(title) printf(" \"%-*s", LMARGIN, title); linelen = 0 -#define endline() printf("\\n\",\n") +#define startline(title) g_printf(" \"%-*s", LMARGIN, title); linelen = 0 +#define endline() g_printf("\\n\",\n") static void prstr(const char *); static void prvar(const char *, const char *); @@ -62,7 +67,7 @@ prstr( endline(); startline(""); } - printf(" %s", string); + g_printf(" %s", string); linelen += len; } @@ -87,12 +92,12 @@ prvar( buf_len = new_len; buf = malloc(new_len); if (!buf) { - fprintf(stderr, "genversion: Not enough memory"); + g_fprintf(stderr, _("genversion: Not enough memory")); abort(); /*NOTREACHED*/ } } - snprintf(buf, buf_len, "%s=\\\"%s\\\"", var, val); /* safe */ + g_snprintf(buf, buf_len, "%s=\\\"%s\\\"", var, val); /* safe */ prstr(buf); } @@ -111,12 +116,12 @@ prundefvar( buf_len = new_len; buf = malloc(new_len); /* let it die if malloc() fails */ if (!buf) { - fprintf(stderr, "genversion: Not enough memory"); + g_fprintf(stderr, _("genversion: Not enough memory")); abort(); /*NOTREACHED*/ } } - snprintf(buf, buf_len, "%s=UNDEF", var); /* safe */ + g_snprintf(buf, buf_len, "%s=UNDEF", var); /* safe */ prstr(buf); } @@ -129,7 +134,7 @@ prnum( static char number[NUM_STR_SIZE]; size_t new_len; - snprintf(number, SIZEOF(number), "%ld", val); + g_snprintf(number, SIZEOF(number), "%ld", val); new_len = strlen(var) + SIZEOF("=") + strlen(number) @@ -139,12 +144,12 @@ prnum( buf_len = new_len; buf = malloc(new_len); /* let it die if malloc() fails */ if (!buf) { - fprintf(stderr, "genversion: Not enough memory"); + g_fprintf(stderr, _("genversion: Not enough memory")); abort(); /*NOTREACHED*/ } } - snprintf(buf, buf_len, "%s=%s", var, number); /* safe */ + g_snprintf(buf, buf_len, "%s=%s", var, number); /* safe */ prstr(buf); } @@ -160,19 +165,28 @@ main( (void)argc; /* Quiet unused parameter warning */ (void)argv; /* Quiet unused parameter warning */ - printf("/* version.c - generated by genversion.c - DO NOT EDIT! */\n"); - printf("const char * const version_info[] = {\n"); + /* + * Configure program for internationalization: + * 1) Only set the message locale for now. + * 2) Set textdomain for all amanda related programs to "amanda" + * We don't want to be forced to support dozens of message catalogs. + */ + setlocale(LC_MESSAGES, "C"); + textdomain("amanda"); + + g_printf(_("/* version.c - generated by genversion.c - DO NOT EDIT! */\n")); + g_printf("const char * const version_info[] = {\n"); startline("build:"); - v = version(); + v = VERSION; v_len = SIZEOF("Amanda-") + strlen(v) + 1; verstr = malloc(v_len); if (!verstr) { - fprintf(stderr, "genversion: Not enough memory"); + g_fprintf(stderr, _("genversion: Not enough memory")); abort(); /*NOTREACHED*/ } - snprintf(verstr, v_len, "Amanda-%s", v); /* safe */ + g_snprintf(verstr, v_len, "Amanda-%s", v); /* safe */ prvar("VERSION", verstr); free(verstr); @@ -188,16 +202,22 @@ main( prundefvar("BUILT_MACH"); #endif -#ifdef CC - prvar("CC", CC); +#ifdef BUILT_REV + prvar("BUILT_REV", BUILT_REV); #else - prundefvar("CC"); + prundefvar("BUILT_REV"); +#endif + +#ifdef BUILT_BRANCH + prvar("BUILT_BRANCH", BUILT_BRANCH); +#else + prundefvar("BUILT_BRANCH"); #endif #ifdef CC - prvar("CONFIGURE_COMMAND", CONFIGURE_COMMAND); + prvar("CC", CC); #else - prundefvar("CONFIGURE_COMMAND"); + prundefvar("CC"); #endif endline(); @@ -207,6 +227,7 @@ main( prvar("bindir", bindir); prvar("sbindir", sbindir); prvar("libexecdir", libexecdir); + prvar("amlibexecdir", amlibexecdir); prvar("mandir", mandir); prvar("AMANDA_TMPDIR", AMANDA_TMPDIR); #ifdef AMANDA_DBGDIR @@ -290,7 +311,11 @@ main( prundefvar(" LPRCMD"); #endif +#ifdef MAILER prvar("MAILER", MAILER); +#else + prundefvar(" MAILER"); +#endif #ifdef GNUTAR_LISTED_INCREMENTAL_DIR prvar("listed_incr_dir", GNUTAR_LISTED_INCREMENTAL_DIR); @@ -313,10 +338,6 @@ main( prstr("AIX_BACKUP"); #endif -#ifdef AIX_TAPEIO - prstr("AIX_TAPEIO"); -#endif - #ifdef BROKEN_VOID prstr("BROKEN_VOID"); #endif @@ -341,20 +362,17 @@ main( prstr("HAVE_SYSVSHM"); #endif -#ifdef USE_POSIX_FCNTL - prstr("LOCKING=POSIX_FCNTL"); -#endif -#ifdef USE_FLOCK - prstr("LOCKING=FLOCK"); +#ifdef WANT_AMFLOCK_POSIX + prstr("AMFLOCK_POSIX"); #endif -#ifdef USE_LOCKF - prstr("LOCKING=LOCKF"); +#ifdef WANT_AMFLOCK_FLOCK + prstr("AMFLOCK_FLOCK"); #endif -#ifdef USE_LNLOCK - prstr("LOCKING=LNLOCK"); +#ifdef WANT_AMFLOCK_LOCKF + prstr("AMFLOCK_LOCKF"); #endif -#if !defined(USE_POSIX_FCNTL) && !defined(USE_FLOCK) && !defined(USE_LOCK) && !defined(USE_LNLOCK) - prstr("LOCKING=**NONE**"); +#ifdef WANT_AMFLOCK_LNLOCK + prstr("AMFLOCK_LNLOCK"); #endif #ifdef STATFS_BSD @@ -377,10 +395,6 @@ main( prstr("ASSERTIONS"); #endif -#ifdef DEBUG_CODE - prstr("DEBUG_CODE"); -#endif - #ifdef AMANDA_DEBUG_DAYS prnum("AMANDA_DEBUG_DAYS", AMANDA_DEBUG_DAYS); #endif @@ -389,10 +403,6 @@ main( prstr("BSD_SECURITY"); #endif -#ifdef KRB4_SECURITY - prstr("KRB4_SECURITY"); -#endif - #ifdef KRB5_SECURITY prstr("KRB5_SECURITY"); #endif @@ -411,12 +421,8 @@ main( prvar("CLIENT_LOGIN", CLIENT_LOGIN); -#ifdef FORCE_USERID - prstr("FORCE_USERID"); -#endif - -#ifdef USE_VERSION_SUFFIXES - prstr("USE_VERSION_SUFFIXES"); +#ifdef CHECK_USERID + prstr("CHECK_USERID"); #endif #ifdef HAVE_GZIP @@ -441,7 +447,7 @@ main( endline(); - printf(" 0\n};\n"); + g_printf(" 0\n};\n"); return (0); /* exit */ }