Imported Upstream version 3.3.2

[debian/amanda] / server-src / amtrmlog.c

diff --git a/server-src/amtrmlog.c b/server-src/amtrmlog.c
index 530fcf5b8af5aeab92f7db1d8a7fbcdce369c83c..6b4e0eadbd1aca28321ce25eaab81492704d6dff 100644 (file)
--- a/server-src/amtrmlog.c
+++ b/server-src/amtrmlog.c
@@ -37,7 +37,6 @@
 #include "diskfile.h"
 #include "tapefile.h"
 #include "find.h"
-#include "version.h"
 
 int amtrmidx_debug = 0;
 
@@ -65,7 +64,12 @@ main(
     char *conf_tapelist;
     char *conf_logdir;
     int dumpcycle;
-    config_overwrites_t *cfg_ovr = NULL;
+    config_overrides_t *cfg_ovr = NULL;
+
+    if (argc > 1 && argv && argv[1] && g_str_equal(argv[1], "--version")) {
+       printf("amtrmlog-%s\n", VERSION);
+       return (0);
+    }
 
     /*
      * Configure program for internationalization:
@@ -84,7 +88,7 @@ main(
     /* Don't die when child closes pipe */
     signal(SIGPIPE, SIG_IGN);
 
-    cfg_ovr = extract_commandline_config_overwrites(&argc, &argv);
+    cfg_ovr = extract_commandline_config_overrides(&argc, &argv);
 
     if (argc > 1 && strcmp(argv[1], "-t") == 0) {
        amtrmidx_debug = 1;
@@ -98,10 +102,10 @@ main(
     }
 
     dbopen(DBG_SUBDIR_SERVER);
-    dbprintf(_("%s: version %s\n"), argv[0], version());
+    dbprintf(_("%s: version %s\n"), argv[0], VERSION);
 
+    set_config_overrides(cfg_ovr);
     config_init(CONFIG_INIT_EXPLICIT_NAME, argv[1]);
-    apply_config_overwrites(cfg_ovr);
 
     conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE));
     read_diskfile(conf_diskfile, &diskl);