#include "amanda.h"
#include "arglist.h"
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
#include "conffile.h"
#include "diskfile.h"
#include "tapefile.h"
char *logname = NULL;
struct stat stat_log;
struct stat stat_old;
- char *conffile;
char *conf_diskfile;
char *conf_tapelist;
char *conf_logdir;
int dumpcycle;
- int new_argc, my_argc;
- char **new_argv, **my_argv;
+ config_overwrites_t *cfg_ovr = NULL;
+
+ /*
+ * 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");
safe_fd(-1, 0);
safe_cd();
/* Don't die when child closes pipe */
signal(SIGPIPE, SIG_IGN);
- parse_conf(argc, argv, &new_argc, &new_argv);
- my_argc = new_argc;
- my_argv = new_argv;
+ cfg_ovr = extract_commandline_config_overwrites(&argc, &argv);
- if (my_argc > 1 && strcmp(my_argv[1], "-t") == 0) {
+ if (argc > 1 && strcmp(argv[1], "-t") == 0) {
amtrmidx_debug = 1;
- my_argc--;
- my_argv++;
+ argc--;
+ argv++;
}
- if (my_argc < 2) {
- fprintf(stderr, "Usage: %s [-t] <config> [-o configoption]*\n", my_argv[0]);
+ if (argc < 2) {
+ g_fprintf(stderr, _("Usage: %s [-t] <config> [-o configoption]*\n"), argv[0]);
return 1;
}
dbopen(DBG_SUBDIR_SERVER);
- dbprintf(("%s: version %s\n", my_argv[0], version()));
+ dbprintf(_("%s: version %s\n"), argv[0], version());
- config_name = my_argv[1];
+ config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_FATAL,
+ argv[1]);
+ apply_config_overwrites(cfg_ovr);
- config_dir = vstralloc(CONFIG_DIR, "/", config_name, "/", NULL);
- conffile = stralloc2(config_dir, CONFFILE_NAME);
- if (read_conffile(conffile)) {
- error("errors processing amanda config file \"%s\"", conffile);
- /*NOTREACHED*/
- }
- amfree(conffile);
+ check_running_as(RUNNING_AS_DUMPUSER);
dbrename(config_name, DBG_SUBDIR_SERVER);
- report_bad_conf_arg();
-
- conf_diskfile = getconf_str(CNF_DISKFILE);
- if (*conf_diskfile == '/') {
- conf_diskfile = stralloc(conf_diskfile);
- } else {
- conf_diskfile = stralloc2(config_dir, conf_diskfile);
- }
+ conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE));
if (read_diskfile(conf_diskfile, &diskl) < 0) {
- error("could not load disklist \"%s\"", conf_diskfile);
+ error(_("could not load disklist \"%s\""), conf_diskfile);
/*NOTREACHED*/
}
amfree(conf_diskfile);
- conf_tapelist = getconf_str(CNF_TAPELIST);
- if (*conf_tapelist == '/') {
- conf_tapelist = stralloc(conf_tapelist);
- } else {
- conf_tapelist = stralloc2(config_dir, conf_tapelist);
- }
+ conf_tapelist = config_dir_relative(getconf_str(CNF_TAPELIST));
if (read_tapelist(conf_tapelist)) {
- error("could not load tapelist \"%s\"", conf_tapelist);
+ error(_("could not load tapelist \"%s\""), conf_tapelist);
/*NOTREACHED*/
}
amfree(conf_tapelist);
/* determine how many log to keep */
no_keep = getconf_int(CNF_TAPECYCLE) * 2;
- dbprintf(("Keeping %d log file%s\n", no_keep, (no_keep == 1) ? "" : "s"));
+ dbprintf(plural(_("Keeping %d log file\n"),
+ _("Keeping %d log files\n"), no_keep),
+ no_keep);
- conf_logdir = getconf_str(CNF_LOGDIR);
- if (*conf_logdir == '/') {
- conf_logdir = stralloc(conf_logdir);
- } else {
- conf_logdir = stralloc2(config_dir, conf_logdir);
- }
+ 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) {
- error("could not create parents of %s: %s", olddir, strerror(errno));
+ error(_("could not create parents of %s: %s"), olddir, strerror(errno));
/*NOTREACHED*/
}
if (mkdir(olddir, 02700) != 0 && errno != EEXIST) {
- error("could not create %s: %s", olddir, strerror(errno));
+ error(_("could not create %s: %s"), olddir, strerror(errno));
/*NOTREACHED*/
}
if (stat(olddir,&stat_old) == -1) {
- error("can't stat oldlog directory \"%s\": %s", olddir, strerror(errno));
+ error(_("can't stat oldlog directory \"%s\": %s"), olddir, strerror(errno));
/*NOTREACHED*/
}
if (!S_ISDIR(stat_old.st_mode)) {
- error("Oldlog directory \"%s\" is not a directory", olddir);
+ error(_("Oldlog directory \"%s\" is not a directory"), olddir);
/*NOTREACHED*/
}
if ((dir = opendir(conf_logdir)) == NULL) {
- error("could not open log directory \"%s\": %s", conf_logdir,strerror(errno));
+ error(_("could not open log directory \"%s\": %s"), conf_logdir,strerror(errno));
/*NOTREACHED*/
}
while ((adir=readdir(dir)) != NULL) {
newfile = newvstralloc(newfile,
olddir, "/", adir->d_name, NULL);
if (rename(oldfile,newfile) != 0) {
- error("could not rename \"%s\" to \"%s\": %s",
+ error(_("could not rename \"%s\" to \"%s\": %s"),
oldfile, newfile, strerror(errno));
/*NOTREACHED*/
}
amfree(oldfile);
amfree(newfile);
amfree(olddir);
- amfree(config_dir);
amfree(conf_logdir);
clear_tapelist();
free_disklist(&diskl);
- free_new_argv(new_argc, new_argv);
- free_server_config();
dbclose();
projects / debian / amanda / blobdiff