#include "diskfile.h"
#include "tapefile.h"
#include "find.h"
-#include "version.h"
int amtrmidx_debug = 0;
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:
/* 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;
}
dbopen(DBG_SUBDIR_SERVER);
- dbprintf(_("%s: version %s\n"), argv[0], version());
+ dbprintf(_("%s: version %s\n"), argv[0], VERSION);
- config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_FATAL,
- argv[1]);
- apply_config_overwrites(cfg_ovr);
-
- check_running_as(RUNNING_AS_DUMPUSER);
-
- dbrename(config_name, DBG_SUBDIR_SERVER);
+ set_config_overrides(cfg_ovr);
+ config_init(CONFIG_INIT_EXPLICIT_NAME, argv[1]);
conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE));
- if (read_diskfile(conf_diskfile, &diskl) < 0) {
- error(_("could not load disklist \"%s\""), conf_diskfile);
- /*NOTREACHED*/
- }
+ read_diskfile(conf_diskfile, &diskl);
amfree(conf_diskfile);
+ if (config_errors(NULL) >= CFGERR_WARNINGS) {
+ config_print_errors();
+ if (config_errors(NULL) >= CFGERR_ERRORS) {
+ g_critical(_("errors processing config file"));
+ }
+ }
+
+ check_running_as(RUNNING_AS_DUMPUSER);
+
+ dbrename(get_config_name(), DBG_SUBDIR_SERVER);
+
conf_tapelist = config_dir_relative(getconf_str(CNF_TAPELIST));
if (read_tapelist(conf_tapelist)) {
error(_("could not load tapelist \"%s\""), conf_tapelist);
conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
olddir = vstralloc(conf_logdir, "/oldlog", NULL);
- if (mkpdir(olddir, 02700, (uid_t)-1, (gid_t)-1) != 0) {
+ if (mkpdir(olddir, 0700, (uid_t)-1, (gid_t)-1) != 0) {
error(_("could not create parents of %s: %s"), olddir, strerror(errno));
/*NOTREACHED*/
}
- if (mkdir(olddir, 02700) != 0 && errno != EEXIST) {
+ if (mkdir(olddir, 0700) != 0 && errno != EEXIST) {
error(_("could not create %s: %s"), olddir, strerror(errno));
/*NOTREACHED*/
}