X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Famtrmlog.c;h=6b4e0eadbd1aca28321ce25eaab81492704d6dff;hb=4c9eba1feb11adf189bceb4001c425e641f0b56a;hp=f075ca92f99867386740b5af6fa19f3966a81d91;hpb=eefb15c5c04acb3c75f0c704ea664feb1bbae75c;p=debian%2Famanda

diff --git a/server-src/amtrmlog.c b/server-src/amtrmlog.c
index f075ca9..6b4e0ea 100644
--- a/server-src/amtrmlog.c
+++ b/server-src/amtrmlog.c
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: amtrmlog.c,v 1.10 2006/01/14 04:37:19 paddy_s Exp $
+ * $Id: amtrmlog.c,v 1.17 2006/07/25 18:27:57 martinea Exp $
  *
  * trims number of index files to only those still in system.  Well
  * actually, it keeps a few extra, plus goes back to the last level 0
@@ -33,20 +33,19 @@
 
 #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"
 #include "find.h"
-#include "version.h"
 
-int main P((int, char **));
+int amtrmidx_debug = 0;
 
-int main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv);
+
+int
+main(
+    int		argc,
+    char **	argv)
 {
     disklist_t diskl;
     int no_keep;			/* files per system to keep */
@@ -61,11 +60,25 @@ char **argv;
     char *logname = NULL;
     struct stat stat_log;
     struct stat stat_old;
-    char *conffile;
     char *conf_diskfile;
     char *conf_tapelist;
     char *conf_logdir;
-    int amtrmidx_debug = 0;
+    int dumpcycle;
+    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:
+     *   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();
@@ -75,6 +88,8 @@ char **argv;
     /* Don't die when child closes pipe */
     signal(SIGPIPE, SIG_IGN);
 
+    cfg_ovr = extract_commandline_config_overrides(&argc, &argv);
+
     if (argc > 1 && strcmp(argv[1], "-t") == 0) {
 	amtrmidx_debug = 1;
 	argc--;
@@ -82,84 +97,94 @@ char **argv;
     }
 
     if (argc < 2) {
-	fprintf(stderr, "Usage: %s [-t] <config>\n", argv[0]);
+	g_fprintf(stderr, _("Usage: %s [-t] <config> [-o configoption]*\n"), argv[0]);
 	return 1;
     }
 
-    dbopen();
-    dbprintf(("%s: version %s\n", argv[0], version()));
+    dbopen(DBG_SUBDIR_SERVER);
+    dbprintf(_("%s: version %s\n"), argv[0], VERSION);
 
-    config_name = argv[1];
+    set_config_overrides(cfg_ovr);
+    config_init(CONFIG_INIT_EXPLICIT_NAME, argv[1]);
 
-    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);
-    amfree(conffile);
+    conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE));
+    read_diskfile(conf_diskfile, &diskl);
+    amfree(conf_diskfile);
 
-    conf_diskfile = getconf_str(CNF_DISKFILE);
-    if (*conf_diskfile == '/') {
-	conf_diskfile = stralloc(conf_diskfile);
-    } else {
-	conf_diskfile = stralloc2(config_dir, conf_diskfile);
+    if (config_errors(NULL) >= CFGERR_WARNINGS) {
+	config_print_errors();
+	if (config_errors(NULL) >= CFGERR_ERRORS) {
+	    g_critical(_("errors processing config file"));
+	}
     }
-    if (read_diskfile(conf_diskfile, &diskl) < 0)
-	error("could not load disklist \"%s\"", conf_diskfile);
-    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);
+    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);
+	/*NOTREACHED*/
     }
-    if (read_tapelist(conf_tapelist))
-	error("could not load tapelist \"%s\"", conf_tapelist);
     amfree(conf_tapelist);
 
     today = time((time_t *)NULL);
-    date_keep = today - (getconf_int(CNF_DUMPCYCLE)*86400);
+    dumpcycle = getconf_int(CNF_DUMPCYCLE);
+    if(dumpcycle > 5000)
+	dumpcycle = 5000;
+    date_keep = today - (dumpcycle * 86400);
 
     output_find_log = find_log();
 
     /* 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));
-    if (mkdir(olddir, 02700) != 0 && errno != EEXIST)
-	error("could not create %s: %s", olddir, strerror(errno));
+    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, 0700) != 0 && errno != EEXIST) {
+	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));
+    if ((dir = opendir(conf_logdir)) == NULL) {
+	error(_("could not open log directory \"%s\": %s"), conf_logdir,strerror(errno));
+	/*NOTREACHED*/
+    }
     while ((adir=readdir(dir)) != NULL) {
 	if(strncmp(adir->d_name,"log.",4)==0) {
 	    useful=0;
 	    for (name=output_find_log;*name !=NULL; name++) {
-		if(strncmp(adir->d_name,*name,12)==0) {
+		if((strlen(adir->d_name) >= 13 &&
+		    strlen(*name) >= 13 &&
+		    adir->d_name[12] == '.' && (*name)[12] == '.' &&
+		    strncmp(adir->d_name,*name,12)==0) ||
+		   strncmp(adir->d_name,*name,18)==0) {
 		    useful=1;
+		    break;
 		}
 	    }
 	    logname=newvstralloc(logname,
 				 conf_logdir, "/" ,adir->d_name, NULL);
 	    if(stat(logname,&stat_log)==0) {
-		if(stat_log.st_mtime > date_keep) {
+		if((time_t)stat_log.st_mtime > date_keep) {
 		    useful = 1;
 		}
 	    }
@@ -168,9 +193,11 @@ char **argv;
 				       conf_logdir, "/", adir->d_name, NULL);
 		newfile = newvstralloc(newfile,
 				       olddir, "/", adir->d_name, NULL);
-		if (rename(oldfile,newfile) != 0)
-		    error("could not rename \"%s\" to \"%s\": %s",
+		if (rename(oldfile,newfile) != 0) {
+		    error(_("could not rename \"%s\" to \"%s\": %s"),
 			  oldfile, newfile, strerror(errno));
+		    /*NOTREACHED*/
+	    	}
 	    }
 	}
     }
@@ -183,8 +210,9 @@ char **argv;
     amfree(oldfile);
     amfree(newfile);
     amfree(olddir);
-    amfree(config_dir);
     amfree(conf_logdir);
+    clear_tapelist();
+    free_disklist(&diskl);
 
     dbclose();