X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Famadmin.c;h=e54507600e71c1ae8b760f6f85c3cb91b43881a9;hb=12179dea039515c06168c0037d048566a3f623de;hp=c3169076fc61696f00ff58f9f673155dee708d98;hpb=0de2ad0a86685398621fb8ffa6990c029681bb3a;p=debian%2Famanda

diff --git a/server-src/amadmin.c b/server-src/amadmin.c
index c316907..e545076 100644
--- a/server-src/amadmin.c
+++ b/server-src/amadmin.c
@@ -25,7 +25,7 @@
  *			   University of Maryland at College Park
  */
 /*
- * $Id: amadmin.c,v 1.49.2.13.2.3.2.15.2.9 2005/03/29 16:35:11 martinea Exp $
+ * $Id: amadmin.c,v 1.124 2006/07/26 15:17:37 martinea Exp $
  *
  * controlling process for the Amanda backup system
  */
@@ -39,89 +39,145 @@
 #include "holding.h"
 #include "find.h"
 
-disklist_t *diskqp;
-
-int main P((int argc, char **argv));
-void usage P((void));
-void force P((int argc, char **argv));
-void force_one P((disk_t *dp));
-void unforce P((int argc, char **argv));
-void unforce_one P((disk_t *dp));
-void force_bump P((int argc, char **argv));
-void force_bump_one P((disk_t *dp));
-void force_no_bump P((int argc, char **argv));
-void force_no_bump_one P((disk_t *dp));
-void unforce_bump P((int argc, char **argv));
-void unforce_bump_one P((disk_t *dp));
-void reuse P((int argc, char **argv));
-void noreuse P((int argc, char **argv));
-void info P((int argc, char **argv));
-void info_one P((disk_t *dp));
-void due P((int argc, char **argv));
-void due_one P((disk_t *dp));
-void find P((int argc, char **argv));
-void delete P((int argc, char **argv));
-void delete_one P((disk_t *dp));
-void balance P((int argc, char **argv));
-void tape P((void));
-void bumpsize P((void));
-void diskloop P((int argc, char **argv, char *cmdname,
-		 void (*func) P((disk_t *dp))));
-char *seqdatestr P((int seq));
-static int next_level0 P((disk_t *dp, info_t *info));
-int bump_thresh P((int level));
-void export_db P((int argc, char **argv));
-void import_db P((int argc, char **argv));
-void disklist P((int argc, char **argv));
-void disklist_one P((disk_t *dp));
-static void check_dumpuser P((void));
+disklist_t diskq;
+
+int main(int argc, char **argv);
+void usage(void);
+void force(int argc, char **argv);
+void force_one(disk_t *dp);
+void unforce(int argc, char **argv);
+void unforce_one(disk_t *dp);
+void force_bump(int argc, char **argv);
+void force_bump_one(disk_t *dp);
+void force_no_bump(int argc, char **argv);
+void force_no_bump_one(disk_t *dp);
+void unforce_bump(int argc, char **argv);
+void unforce_bump_one(disk_t *dp);
+void reuse(int argc, char **argv);
+void noreuse(int argc, char **argv);
+void info(int argc, char **argv);
+void info_one(disk_t *dp);
+void due(int argc, char **argv);
+void due_one(disk_t *dp);
+void find(int argc, char **argv);
+void delete(int argc, char **argv);
+void delete_one(disk_t *dp);
+void balance(int argc, char **argv);
+void tape(int argc, char **argv);
+void bumpsize(int argc, char **argv);
+void diskloop(int argc, char **argv, char *cmdname, void (*func)(disk_t *dp));
+char *seqdatestr(int seq);
+static int next_level0(disk_t *dp, info_t *info);
+int bump_thresh(int level);
+void export_db(int argc, char **argv);
+void import_db(int argc, char **argv);
+void disklist(int argc, char **argv);
+void disklist_one(disk_t *dp);
+void show_version(int argc, char **argv);
+static void show_config(int argc, char **argv);
+static void check_dumpuser(void);
 
 static char *conf_tapelist = NULL;
 static char *displayunit;
 static long int unitdivisor;
 
-int main(argc, argv)
-int argc;
-char **argv;
+static const struct {
+    const char *name;
+    void (*fn)(int, char **);
+    const char *usage;
+} cmdtab[] = {
+    { "version", show_version,
+	"\t\t\t\t\t# Show version info." },
+    { "config", show_config,
+	"\t\t\t\t\t# Show configuration." },
+    { "force", force,
+	" [<hostname> [<disks>]* ]+\t\t# Force level 0 at next run." },
+    { "unforce", unforce,
+	" [<hostname> [<disks>]* ]+\t# Clear force command." },
+    { "force-bump", force_bump,
+	" [<hostname> [<disks>]* ]+\t# Force bump at next run." },
+    { "force-no-bump", force_no_bump,
+	" [<hostname> [<disks>]* ]+\t# Force no-bump at next run." },
+    { "unforce-bump", unforce_bump,
+	" [<hostname> [<disks>]* ]+\t# Clear bump command." },
+    { "disklist", disklist,
+	" [<hostname> [<disks>]* ]*\t# Debug disklist entries." },
+    { "reuse", reuse,
+	" <tapelabel> ...\t\t # re-use this tape." },
+    { "no-reuse", noreuse,
+	" <tapelabel> ...\t # never re-use this tape." },
+    { "find", find,
+	" [<hostname> [<disks>]* ]*\t # Show which tapes these dumps are on." },
+    { "delete", delete,
+	" [<hostname> [<disks>]* ]+ # Delete from database." },
+    { "info", info,
+	" [<hostname> [<disks>]* ]*\t # Show current info records." },
+    { "due", due,
+	" [<hostname> [<disks>]* ]*\t # Show due date." },
+    { "balance", balance,
+	" [-days <num>]\t\t # Show nightly dump size balance." },
+    { "tape", tape,
+	" [-days <num>]\t\t # Show which tape is due next." },
+    { "bumpsize", bumpsize,
+	"\t\t\t # Show current bump thresholds." },
+    { "export", export_db,
+	" [<hostname> [<disks>]* ]* # Export curinfo database to stdout." },
+    { "import", import_db,
+	"\t\t\t\t # Import curinfo database from stdin." },
+};
+#define	NCMDS	(int)(sizeof(cmdtab) / sizeof(cmdtab[0]))
+
+static char *conffile;
+
+int
+main(
+    int		argc,
+    char **	argv)
 {
-    int fd;
-    unsigned long malloc_hist_1, malloc_size_1;
-    unsigned long malloc_hist_2, malloc_size_2;
+    int i;
     char *conf_diskfile;
     char *conf_infofile;
-    char *conffile;
-
-    for(fd = 3; fd < FD_SETSIZE; fd++) {
-	/*
-	 * Make sure nobody spoofs us with a lot of extra open files
-	 * that would cause an open we do to get a very high file
-	 * descriptor, which in turn might be used as an index into
-	 * an array (e.g. an fd_set).
-	 */
-	close(fd);
-    }
+    unsigned long malloc_hist_1, malloc_size_1;
+    unsigned long malloc_hist_2, malloc_size_2;
+    int new_argc;
+    char **new_argv;
 
+    safe_fd(-1, 0);
     safe_cd();
 
     set_pname("amadmin");
 
+    dbopen(DBG_SUBDIR_SERVER);
+
+    /* Don't die when child closes pipe */
+    signal(SIGPIPE, SIG_IGN);
+
     malloc_size_1 = malloc_inuse(&malloc_hist_1);
 
     erroutput_type = ERR_INTERACTIVE;
 
-    if(argc < 3) usage();
+    parse_server_conf(argc, argv, &new_argc, &new_argv);
 
-    if(strcmp(argv[2],"version") == 0) {
-	for(argc=0; version_info[argc]; printf("%s",version_info[argc++]));
-	return 0;
+    if(new_argc < 3) usage();
+
+    if(strcmp(new_argv[2],"version") == 0) {
+	show_version(new_argc, new_argv);
+	goto done;
     }
-    config_name = argv[1];
+
+    config_name = new_argv[1];
+
     config_dir = vstralloc(CONFIG_DIR, "/", config_name, "/", NULL);
     conffile = stralloc2(config_dir, CONFFILE_NAME);
+
     if(read_conffile(conffile)) {
 	error("errors processing config file \"%s\"", conffile);
+	/*NOTREACHED*/
     }
-    amfree(conffile);
+
+    dbrename(config_name, DBG_SUBDIR_SERVER);
+
+    report_bad_conf_arg();
 
     check_dumpuser();
 
@@ -131,10 +187,12 @@ char **argv;
     } else {
 	conf_diskfile = stralloc2(config_dir, conf_diskfile);
     }
-    if((diskqp = read_diskfile(conf_diskfile)) == NULL) {
+    if (read_diskfile(conf_diskfile, &diskq) < 0) {
 	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);
@@ -143,6 +201,7 @@ char **argv;
     }
     if(read_tapelist(conf_tapelist)) {
 	error("could not load tapelist \"%s\"", conf_tapelist);
+	/*NOTREACHED*/
     }
     conf_infofile = getconf_str(CNF_INFOFILE);
     if (*conf_infofile == '/') {
@@ -152,89 +211,56 @@ char **argv;
     }
     if(open_infofile(conf_infofile)) {
 	error("could not open info db \"%s\"", conf_infofile);
+	/*NOTREACHED*/
     }
     amfree(conf_infofile);
 
     displayunit = getconf_str(CNF_DISPLAYUNIT);
     unitdivisor = getconf_unit_divisor();
 
-    if(strcmp(argv[2],"force-bump") == 0) force_bump(argc, argv);
-    else if(strcmp(argv[2],"force-no-bump") == 0) force_no_bump(argc, argv);
-    else if(strcmp(argv[2],"unforce-bump") == 0) unforce_bump(argc, argv);
-    else if(strcmp(argv[2],"force") == 0) force(argc, argv);
-    else if(strcmp(argv[2],"unforce") == 0) unforce(argc, argv);
-    else if(strcmp(argv[2],"reuse") == 0) reuse(argc, argv);
-    else if(strcmp(argv[2],"no-reuse") == 0) noreuse(argc, argv);
-    else if(strcmp(argv[2],"info") == 0) info(argc, argv);
-    else if(strcmp(argv[2],"due") == 0) due(argc, argv);
-    else if(strcmp(argv[2],"find") == 0) find(argc, argv);
-    else if(strcmp(argv[2],"delete") == 0) delete(argc, argv);
-    else if(strcmp(argv[2],"balance") == 0) balance(argc, argv);
-    else if(strcmp(argv[2],"tape") == 0) tape();
-    else if(strcmp(argv[2],"bumpsize") == 0) bumpsize();
-    else if(strcmp(argv[2],"import") == 0) import_db(argc, argv);
-    else if(strcmp(argv[2],"export") == 0) export_db(argc, argv);
-    else if(strcmp(argv[2],"disklist") == 0) disklist(argc, argv);
-    else {
-	fprintf(stderr, "%s: unknown command \"%s\"\n", argv[0], argv[2]);
+    for (i = 0; i < NCMDS; i++)
+	if (strcmp(new_argv[2], cmdtab[i].name) == 0) {
+	    (*cmdtab[i].fn)(new_argc, new_argv);
+	    break;
+	}
+    if (i == NCMDS) {
+	fprintf(stderr, "%s: unknown command \"%s\"\n", new_argv[0], new_argv[2]);
 	usage();
     }
+
+    free_new_argv(new_argc, new_argv);
+
     close_infofile();
     clear_tapelist();
     amfree(conf_tapelist);
     amfree(config_dir);
 
+done:
+
     malloc_size_2 = malloc_inuse(&malloc_hist_2);
 
     if(malloc_size_1 != malloc_size_2) {
 	malloc_list(fileno(stderr), malloc_hist_1, malloc_hist_2);
     }
 
+    amfree(conffile);
+    free_disklist(&diskq);
+    free_server_config();
+    dbclose();
     return 0;
 }
 
 
-void usage P((void))
+void
+usage(void)
 {
-    fprintf(stderr, "\nUsage: %s%s <conf> <command> {<args>} ...\n",
+    int i;
+
+    fprintf(stderr, "\nUsage: %s%s <conf> <command> {<args>} [-o configoption]* ...\n",
 	    get_pname(), versionsuffix());
     fprintf(stderr, "    Valid <command>s are:\n");
-    fprintf(stderr,"\tversion\t\t\t\t# Show version info.\n");
-    fprintf(stderr,
-	    "\tforce [<hostname> [<disks>]* ]+\t# Force level 0 at next run.\n");
-    fprintf(stderr,
-	    "\tunforce [<hostname> [<disks>]* ]+\t# Clear force command.\n");
-    fprintf(stderr,
-	    "\tforce-bump [<hostname> [<disks>]* ]+\t# Force bump at next run.\n");
-    fprintf(stderr,
-	    "\tforce-no-bump [<hostname> [<disks>]* ]+\t# Force no-bump at next run.\n");
-    fprintf(stderr,
-	    "\tunforce-bump [<hostname> [<disks>]* ]+\t# Clear bump command.\n");
-    fprintf(stderr,
-	    "\treuse <tapelabel> ...\t\t# re-use this tape.\n");
-    fprintf(stderr,
-	    "\tno-reuse <tapelabel> ...\t# never re-use this tape.\n");
-    fprintf(stderr,
-	    "\tfind [<hostname> [<disks>]* ]*\t# Show which tapes these dumps are on.\n");
-    fprintf(stderr,
-	    "\tdelete [<hostname> [<disks>]* ]*\t# Delete from database.\n");
-    fprintf(stderr,
-	    "\tinfo [<hostname> [<disks>]* ]*\t# Show current info records.\n");
-    fprintf(stderr,
-	    "\tdue [<hostname> [<disks>]* ]*\t# Show due date.\n");
-    fprintf(stderr,
-	    "\tbalance [-days <num>]\t\t# Show nightly dump size balance.\n");
-    fprintf(stderr,
-	    "\ttape\t\t\t\t# Show which tape is due next.\n");
-    fprintf(stderr,
-	    "\tbumpsize\t\t\t# Show current bump thresholds.\n");
-    fprintf(stderr,
-	    "\texport [<hostname> [<disks>]* ]*\t# Export curinfo database to stdout.\n");
-    fprintf(stderr,
-	    "\timport\t\t\t\t# Import curinfo database from stdin.\n");
-    fprintf(stderr,
-  	    "\tdisklist [<hostname> [<disks>]* ]*\t# Show disklist entries.\n");
-
+    for (i = 0; i < NCMDS; i++)
+	fprintf(stderr, "\t%s%s\n", cmdtab[i].name, cmdtab[i].usage);
     exit(1);
 }
 
@@ -244,8 +270,9 @@ void usage P((void))
 #define SECS_PER_DAY (24*60*60)
 time_t today;
 
-char *seqdatestr(seq)
-int seq;
+char *
+seqdatestr(
+    int		seq)
 {
     static char str[16];
     static char *dow[7] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
@@ -254,18 +281,23 @@ int seq;
 
     tm = localtime(&t);
 
-    ap_snprintf(str, sizeof(str),
-		"%2d/%02d %3s", tm->tm_mon+1, tm->tm_mday, dow[tm->tm_wday]);
+    if (tm)
+	snprintf(str, SIZEOF(str),
+		 "%2d/%02d %3s", tm->tm_mon+1, tm->tm_mday, dow[tm->tm_wday]);
+    else
+	strcpy(str, "BAD DATE");
+
     return str;
 }
 
 #undef days_diff
-#define days_diff(a, b)        (((b) - (a) + SECS_PER_DAY) / SECS_PER_DAY)
+#define days_diff(a, b)        (int)(((b) - (a) + SECS_PER_DAY) / SECS_PER_DAY)
 
 /* when is next level 0 due? 0 = tonight, 1 = tommorrow, etc*/
-static int next_level0(dp, info)
-disk_t *dp;
-info_t *info;
+static int
+next_level0(
+    disk_t *	dp,
+    info_t *	info)
 {
     if(dp->strategy == DS_NOFULL)
 	return 1;	/* fake it */
@@ -275,7 +307,8 @@ info_t *info;
 	return dp->dumpcycle - days_diff(info->inf[0].date, today);
 }
 
-static void check_dumpuser()
+static void
+check_dumpuser(void)
 {
     static int been_here = 0;
     uid_t uid_me;
@@ -292,16 +325,17 @@ static void check_dumpuser()
 
     if ((pw = getpwnam(dumpuser)) == NULL) {
 	error("cannot look up dump user \"%s\"", dumpuser);
-	/* NOTREACHED */
+	/*NOTREACHED*/
     }
     uid_dumpuser = pw->pw_uid;
     if ((pw = getpwuid(uid_me)) == NULL) {
 	error("cannot look up my own uid %ld", (long)uid_me);
-	/* NOTREACHED */
+	/*NOTREACHED*/
     }
     if (uid_me != uid_dumpuser) {
 	error("ERROR: running as user \"%s\" instead of \"%s\"",
 	      pw->pw_name, dumpuser);
+        /*NOTREACHED*/
     }
     been_here = 1;
     return;
@@ -309,14 +343,16 @@ static void check_dumpuser()
 
 /* ----------------------------------------------- */
 
-void diskloop(argc, argv, cmdname, func)
-int argc;
-char **argv;
-char *cmdname;
-void (*func) P((disk_t *dp));
+void
+diskloop(
+    int		argc,
+    char **	argv,
+    char *	cmdname,
+    void	(*func)(disk_t *dp))
 {
     disk_t *dp;
     int count = 0;
+    char *errstr;
 
     if(argc < 4) {
 	fprintf(stderr,"%s: expecting \"%s [<hostname> [<disks>]* ]+\"\n",
@@ -324,9 +360,13 @@ void (*func) P((disk_t *dp));
 	usage();
     }
 
-    match_disklist(diskqp, argc-3, argv+3);
+    errstr = match_disklist(&diskq, argc-3, argv+3);
+    if (errstr) {
+	printf("%s", errstr);
+	amfree(errstr);
+    }
 
-    for(dp = diskqp->head; dp != NULL; dp = dp->next) {
+    for(dp = diskq.head; dp != NULL; dp = dp->next) {
 	if(dp->todo) {
 	    count++;
 	    func(dp);
@@ -340,8 +380,9 @@ void (*func) P((disk_t *dp));
 /* ----------------------------------------------- */
 
 
-void force_one(dp)
-disk_t *dp;
+void
+force_one(
+    disk_t *	dp)
 {
     char *hostname = dp->host->hostname;
     char *diskname = dp->name;
@@ -351,9 +392,9 @@ disk_t *dp;
     check_dumpuser();
 #endif
     get_info(hostname, diskname, &info);
-    info.command |= FORCE_FULL;
-    if(info.command & FORCE_BUMP) {
-	info.command ^= FORCE_BUMP;
+    SET(info.command, FORCE_FULL);
+    if (ISSET(info.command, FORCE_BUMP)) {
+	CLR(info.command, FORCE_BUMP);
 	printf("%s: WARNING: %s:%s FORCE_BUMP command was cleared.\n",
 	       get_pname(), hostname, diskname);
     }
@@ -367,9 +408,10 @@ disk_t *dp;
 }
 
 
-void force(argc, argv)
-int argc;
-char **argv;
+void
+force(
+    int		argc,
+    char **	argv)
 {
     diskloop(argc, argv, "force", force_one);
 }
@@ -378,19 +420,20 @@ char **argv;
 /* ----------------------------------------------- */
 
 
-void unforce_one(dp)
-disk_t *dp;
+void
+unforce_one(
+    disk_t *	dp)
 {
     char *hostname = dp->host->hostname;
     char *diskname = dp->name;
     info_t info;
 
     get_info(hostname, diskname, &info);
-    if(info.command & FORCE_FULL) {
+    if (ISSET(info.command, FORCE_FULL)) {
 #if TEXTDB
 	check_dumpuser();
 #endif
-	info.command ^= FORCE_FULL;
+	CLR(info.command, FORCE_FULL);
 	if(put_info(hostname, diskname, &info) == 0){
 	    printf("%s: force command for %s:%s cleared.\n",
 		   get_pname(), hostname, diskname);
@@ -406,9 +449,10 @@ disk_t *dp;
     }
 }
 
-void unforce(argc, argv)
-int argc;
-char **argv;
+void
+unforce(
+    int		argc,
+    char **	argv)
 {
     diskloop(argc, argv, "unforce", unforce_one);
 }
@@ -417,8 +461,9 @@ char **argv;
 /* ----------------------------------------------- */
 
 
-void force_bump_one(dp)
-disk_t *dp;
+void
+force_bump_one(
+    disk_t *	dp)
 {
     char *hostname = dp->host->hostname;
     char *diskname = dp->name;
@@ -428,14 +473,14 @@ disk_t *dp;
     check_dumpuser();
 #endif
     get_info(hostname, diskname, &info);
-    info.command |= FORCE_BUMP;
-    if(info.command & FORCE_NO_BUMP) {
-	info.command ^= FORCE_NO_BUMP;
+    SET(info.command, FORCE_BUMP);
+    if (ISSET(info.command, FORCE_NO_BUMP)) {
+	CLR(info.command, FORCE_NO_BUMP);
 	printf("%s: WARNING: %s:%s FORCE_NO_BUMP command was cleared.\n",
 	       get_pname(), hostname, diskname);
     }
-    if (info.command & FORCE_FULL) {
-	info.command ^= FORCE_FULL;
+    if (ISSET(info.command, FORCE_FULL)) {
+	CLR(info.command, FORCE_FULL);
 	printf("%s: WARNING: %s:%s FORCE_FULL command was cleared.\n",
 	       get_pname(), hostname, diskname);
     }
@@ -449,9 +494,10 @@ disk_t *dp;
 }
 
 
-void force_bump(argc, argv)
-int argc;
-char **argv;
+void
+force_bump(
+    int		argc,
+    char **	argv)
 {
     diskloop(argc, argv, "force-bump", force_bump_one);
 }
@@ -460,8 +506,9 @@ char **argv;
 /* ----------------------------------------------- */
 
 
-void force_no_bump_one(dp)
-disk_t *dp;
+void
+force_no_bump_one(
+    disk_t *	dp)
 {
     char *hostname = dp->host->hostname;
     char *diskname = dp->name;
@@ -471,9 +518,9 @@ disk_t *dp;
     check_dumpuser();
 #endif
     get_info(hostname, diskname, &info);
-    info.command |= FORCE_NO_BUMP;
-    if(info.command & FORCE_BUMP) {
-	info.command ^= FORCE_BUMP;
+    SET(info.command, FORCE_NO_BUMP);
+    if (ISSET(info.command, FORCE_BUMP)) {
+	CLR(info.command, FORCE_BUMP);
 	printf("%s: WARNING: %s:%s FORCE_BUMP command was cleared.\n",
 	       get_pname(), hostname, diskname);
     }
@@ -487,9 +534,10 @@ disk_t *dp;
 }
 
 
-void force_no_bump(argc, argv)
-int argc;
-char **argv;
+void
+force_no_bump(
+    int		argc,
+    char **	argv)
 {
     diskloop(argc, argv, "force-no-bump", force_no_bump_one);
 }
@@ -498,22 +546,20 @@ char **argv;
 /* ----------------------------------------------- */
 
 
-void unforce_bump_one(dp)
-disk_t *dp;
+void
+unforce_bump_one(
+    disk_t *	dp)
 {
     char *hostname = dp->host->hostname;
     char *diskname = dp->name;
     info_t info;
 
     get_info(hostname, diskname, &info);
-    if(info.command & (FORCE_BUMP | FORCE_NO_BUMP)) {
+    if (ISSET(info.command, FORCE_BUMP|FORCE_NO_BUMP)) {
 #if TEXTDB
 	check_dumpuser();
 #endif
-	if(info.command & FORCE_BUMP)
-	    info.command ^= FORCE_BUMP;
-	if(info.command & FORCE_NO_BUMP)
-	    info.command ^= FORCE_NO_BUMP;
+	CLR(info.command, FORCE_BUMP|FORCE_NO_BUMP);
 	if(put_info(hostname, diskname, &info) == 0) {
 	    printf("%s: bump command for %s:%s cleared.\n",
 		   get_pname(), hostname, diskname);
@@ -529,9 +575,10 @@ disk_t *dp;
 }
 
 
-void unforce_bump(argc, argv)
-int argc;
-char **argv;
+void
+unforce_bump(
+    int		argc,
+    char **	argv)
 {
     diskloop(argc, argv, "unforce-bump", unforce_bump_one);
 }
@@ -539,9 +586,10 @@ char **argv;
 
 /* ----------------------------------------------- */
 
-void reuse(argc, argv)
-int argc;
-char **argv;
+void
+reuse(
+    int		argc,
+    char **	argv)
 {
     tape_t *tp;
     int count;
@@ -572,12 +620,14 @@ char **argv;
 
     if(write_tapelist(conf_tapelist)) {
 	error("could not write tapelist \"%s\"", conf_tapelist);
+	/*NOTREACHED*/
     }
 }
 
-void noreuse(argc, argv)
-int argc;
-char **argv;
+void
+noreuse(
+    int		argc,
+    char **	argv)
 {
     tape_t *tp;
     int count;
@@ -608,6 +658,7 @@ char **argv;
 
     if(write_tapelist(conf_tapelist)) {
 	error("could not write tapelist \"%s\"", conf_tapelist);
+	/*NOTREACHED*/
     }
 }
 
@@ -616,8 +667,9 @@ char **argv;
 
 static int deleted;
 
-void delete_one(dp)
-disk_t *dp;
+void
+delete_one(
+    disk_t *	dp)
 {
     char *hostname = dp->host->hostname;
     char *diskname = dp->name;
@@ -630,17 +682,20 @@ disk_t *dp;
     }
 
     deleted++;
-    if(del_info(hostname, diskname))
+    if(del_info(hostname, diskname)) {
 	error("couldn't delete %s:%s from database: %s",
 	      hostname, diskname, strerror(errno));
-    else
+        /*NOTREACHED*/
+    } else {
 	printf("%s: %s:%s deleted from curinfo database.\n",
 	       get_pname(), hostname, diskname);
+    }
 }
 
-void delete(argc, argv)
-int argc;
-char **argv;
+void
+delete(
+    int		argc,
+    char **	argv)
 {
     deleted = 0;
     diskloop(argc, argv, "delete", delete_one);
@@ -653,8 +708,9 @@ char **argv;
 
 /* ----------------------------------------------- */
 
-void info_one(dp)
-disk_t *dp;
+void
+info_one(
+    disk_t *	dp)
 {
     info_t info;
     int lev;
@@ -664,49 +720,67 @@ disk_t *dp;
     get_info(dp->host->hostname, dp->name, &info);
 
     printf("\nCurrent info for %s %s:\n", dp->host->hostname, dp->name);
-    if(info.command & FORCE_FULL) 
+    if (ISSET(info.command, FORCE_FULL))
 	printf("  (Forcing to level 0 dump at next run)\n");
-    if(info.command & FORCE_BUMP) 
+    if (ISSET(info.command, FORCE_BUMP))
 	printf("  (Forcing bump at next run)\n");
-    if(info.command & FORCE_NO_BUMP) 
+    if (ISSET(info.command, FORCE_NO_BUMP))
 	printf("  (Forcing no-bump at next run)\n");
-    printf("  Stats: dump rates (kps), Full:  %5.1f, %5.1f, %5.1f\n",
+    printf("  Stats: dump rates (kps), Full:  %5.1lf, %5.1lf, %5.1lf\n",
 	   info.full.rate[0], info.full.rate[1], info.full.rate[2]);
-    printf("                    Incremental:  %5.1f, %5.1f, %5.1f\n",
+    printf("                    Incremental:  %5.1lf, %5.1lf, %5.1lf\n",
 	   info.incr.rate[0], info.incr.rate[1], info.incr.rate[2]);
-    printf("          compressed size, Full: %5.1f%%,%5.1f%%,%5.1f%%\n",
+    printf("          compressed size, Full: %5.1lf%%,%5.1lf%%,%5.1lf%%\n",
 	   info.full.comp[0]*100, info.full.comp[1]*100, info.full.comp[2]*100);
-    printf("                    Incremental: %5.1f%%,%5.1f%%,%5.1f%%\n",
+    printf("                    Incremental: %5.1lf%%,%5.1lf%%,%5.1lf%%\n",
 	   info.incr.comp[0]*100, info.incr.comp[1]*100, info.incr.comp[2]*100);
 
     printf("  Dumps: lev datestmp  tape             file   origK   compK secs\n");
     for(lev = 0, sp = &info.inf[0]; lev < 9; lev++, sp++) {
 	if(sp->date < (time_t)0 && sp->label[0] == '\0') continue;
 	tm = localtime(&sp->date);
-	printf("          %d  %04d%02d%02d  %-15s  %4d %7ld %7ld %4ld\n",
-	       lev, tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
-	       sp->label, sp->filenum, sp->size, sp->csize, sp->secs);
+	if (tm) {
+	    printf("          %d  %04d%02d%02d  %-15s  "
+		   OFF_T_FMT " " OFF_T_FMT " " OFF_T_FMT " " TIME_T_FMT "\n",
+		   lev, tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+		   sp->label,
+		   (OFF_T_FMT_TYPE)sp->filenum,
+		   (OFF_T_FMT_TYPE)sp->size,
+		   (OFF_T_FMT_TYPE)sp->csize,
+		   (TIME_T_FMT_TYPE)sp->secs);
+	} else {
+	    printf("          %d  BAD-DATE  %-15s  "
+		   OFF_T_FMT " " OFF_T_FMT " " OFF_T_FMT " " TIME_T_FMT "\n",
+		   lev,
+		   sp->label,
+		   (OFF_T_FMT_TYPE)sp->filenum,
+		   (OFF_T_FMT_TYPE)sp->size,
+		   (OFF_T_FMT_TYPE)sp->csize,
+		   (TIME_T_FMT_TYPE)sp->secs);
+	}
     }
 }
 
 
-void info(argc, argv)
-int argc;
-char **argv;
+void
+info(
+    int		argc,
+    char **	argv)
 {
     disk_t *dp;
 
     if(argc >= 4)
 	diskloop(argc, argv, "info", info_one);
     else
-	for(dp = diskqp->head; dp != NULL; dp = dp->next)
+	for(dp = diskq.head; dp != NULL; dp = dp->next)
 	    info_one(dp);
 }
 
 /* ----------------------------------------------- */
 
-void due_one(dp)
-disk_t *dp;
+void
+due_one(
+    disk_t *	dp)
 {
     am_host_t *hp;
     int days;
@@ -734,9 +808,10 @@ disk_t *dp;
     }
 }
 
-void due(argc, argv)
-int argc;
-char **argv;
+void
+due(
+    int		argc,
+    char **	argv)
 {
     disk_t *dp;
 
@@ -744,34 +819,58 @@ char **argv;
     if(argc >= 4)
 	diskloop(argc, argv, "due", due_one);
     else
-	for(dp = diskqp->head; dp != NULL; dp = dp->next)
+	for(dp = diskq.head; dp != NULL; dp = dp->next)
 	    due_one(dp);
 }
 
 /* ----------------------------------------------- */
 
-void tape()
+void
+tape(
+    int		argc,
+    char **	argv)
 {
     tape_t *tp, *lasttp;
-    int runtapes, i;
+    int runtapes, i, j;
+    int nb_days = 1;
+
+    if(argc > 4 && strcmp(argv[3],"--days") == 0) {
+	nb_days = atoi(argv[4]);
+	if(nb_days < 1) {
+	    printf("days must be an integer bigger than 0\n");
+	    return;
+	}
+	if (nb_days > 10000)
+	    nb_days = 10000;
+    }
 
     runtapes = getconf_int(CNF_RUNTAPES);
     tp = lookup_last_reusable_tape(0);
 
-    for ( i=0 ; i < runtapes ; i++ ) {
-	printf("The next Amanda run should go onto ");
-
-	if(tp != NULL)
-	    printf("tape %s or ", tp->label);
-	printf("a new tape.\n");
+    for ( j=0 ; j < nb_days ; j++ ) {
+	for ( i=0 ; i < runtapes ; i++ ) {
+	    if(i==0)
+		printf("The next Amanda run should go onto ");
+	    else
+		printf("                                   ");
+	    if(tp != NULL) {
+		printf("tape %s or a new tape.\n", tp->label);
+	    } else {
+		if (runtapes - i == 1)
+		    printf("1 new tape.\n");
+		else
+		    printf("%d new tapes.\n", runtapes - i);
+		i = runtapes;
+	    }
 	
-	tp = lookup_last_reusable_tape(i + 1);
+	    tp = lookup_last_reusable_tape(i + 1);
+	}
     }
     lasttp = lookup_tapepos(lookup_nb_tape());
     i = runtapes;
-    if(lasttp && i > 0 && lasttp->datestamp == 0) {
+    if(lasttp && i > 0 && strcmp(lasttp->datestamp,"0") == 0) {
 	int c = 0;
-	while(lasttp && i > 0 && lasttp->datestamp == 0) {
+	while(lasttp && i > 0 && strcmp(lasttp->datestamp,"0") == 0) {
 	    c++;
 	    lasttp = lasttp->prev;
 	    i--;
@@ -787,7 +886,7 @@ void tape()
 		   lasttp->label);
 	    lasttp = lasttp->prev;
 	    c--;
-	    while(lasttp && c > 0 && lasttp->datestamp == 0) {
+	    while(lasttp && c > 0 && strcmp(lasttp->datestamp,"0") == 0) {
 		printf(", %s", lasttp->label);
 		lasttp = lasttp->prev;
 		c--;
@@ -799,28 +898,28 @@ void tape()
 
 /* ----------------------------------------------- */
 
-void balance(argc, argv)
-int argc;
-char **argv;
+void
+balance(
+    int		argc,
+    char **	argv)
 {
     disk_t *dp;
     struct balance_stats {
 	int disks;
-	long origsize, outsize;
+	off_t origsize, outsize;
     } *sp;
     int conf_runspercycle, conf_dumpcycle;
     int seq, runs_per_cycle, overdue, max_overdue;
     int later, total, balance, distinct;
-    float fseq, disk_dumpcycle;
+    double fseq, disk_dumpcycle;
     info_t info;
-    long int total_balanced, balanced;
+    off_t total_balanced, balanced;
     int empty_day;
 
     time(&today);
     conf_dumpcycle = getconf_int(CNF_DUMPCYCLE);
     conf_runspercycle = getconf_int(CNF_RUNSPERCYCLE);
     later = conf_dumpcycle;
-    if(later > 10000) later = 10000;
     overdue = 0;
     max_overdue = 0;
 
@@ -828,6 +927,7 @@ char **argv;
 	later = atoi(argv[4]);
 	if(later < 0) later = conf_dumpcycle;
     }
+    if(later > 10000) later = 10000;
 
     if(conf_runspercycle == 0) {
 	runs_per_cycle = conf_dumpcycle;
@@ -845,12 +945,14 @@ char **argv;
     distinct = later + 3;
 
     sp = (struct balance_stats *)
-	alloc(sizeof(struct balance_stats) * (distinct+1));
+	alloc(SIZEOF(struct balance_stats) * (distinct+1));
 
-    for(seq=0; seq <= distinct; seq++)
-	sp[seq].disks = sp[seq].origsize = sp[seq].outsize = 0;
+    for(seq=0; seq <= distinct; seq++) {
+	sp[seq].disks = 0;
+	sp[seq].origsize = sp[seq].outsize = (off_t)0;
+    }
 
-    for(dp = diskqp->head; dp != NULL; dp = dp->next) {
+    for(dp = diskq.head; dp != NULL; dp = dp->next) {
 	if(get_info(dp->host->hostname, dp->name, &info)) {
 	    printf("new disk %s:%s ignored.\n", dp->host->hostname, dp->name);
 	    continue;
@@ -859,24 +961,24 @@ char **argv;
 	    continue;
 	}
 	sp[distinct].disks++;
-	sp[distinct].origsize += info.inf[0].size/unitdivisor;
-	sp[distinct].outsize += info.inf[0].csize/unitdivisor;
+	sp[distinct].origsize += info.inf[0].size/(off_t)unitdivisor;
+	sp[distinct].outsize += info.inf[0].csize/(off_t)unitdivisor;
 
 	sp[balance].disks++;
 	if(dp->dumpcycle == 0) {
-	    sp[balance].origsize += (info.inf[0].size/unitdivisor) * runs_per_cycle;
-	    sp[balance].outsize += (info.inf[0].csize/unitdivisor) * runs_per_cycle;
+	    sp[balance].origsize += (info.inf[0].size/(off_t)unitdivisor) * (off_t)runs_per_cycle;
+	    sp[balance].outsize += (info.inf[0].csize/(off_t)unitdivisor) * (off_t)runs_per_cycle;
 	}
 	else {
-	    sp[balance].origsize += (info.inf[0].size/unitdivisor) *
-				    (conf_dumpcycle / dp->dumpcycle);
-	    sp[balance].outsize += (info.inf[0].csize/unitdivisor) *
-				   (conf_dumpcycle / dp->dumpcycle);
+	    sp[balance].origsize += (info.inf[0].size/(off_t)unitdivisor) *
+				    (off_t)(conf_dumpcycle / dp->dumpcycle);
+	    sp[balance].outsize += (info.inf[0].csize/(off_t)unitdivisor) *
+				   (off_t)(conf_dumpcycle / dp->dumpcycle);
 	}
 
-	disk_dumpcycle = dp->dumpcycle;
+	disk_dumpcycle = (double)dp->dumpcycle;
 	if(dp->dumpcycle <= 0)
-	    disk_dumpcycle = ((float)conf_dumpcycle) / ((float)runs_per_cycle);
+	    disk_dumpcycle = ((double)conf_dumpcycle) / ((double)runs_per_cycle);
 
 	seq = next_level0(dp, &info);
 	fseq = seq + 0.0001;
@@ -893,34 +995,34 @@ char **argv;
 	    }
 	    
 	    sp[seq].disks++;
-	    sp[seq].origsize += info.inf[0].size/unitdivisor;
-	    sp[seq].outsize += info.inf[0].csize/unitdivisor;
+	    sp[seq].origsize += info.inf[0].size/(off_t)unitdivisor;
+	    sp[seq].outsize += info.inf[0].csize/(off_t)unitdivisor;
 
 	    if(seq < later) {
 		sp[total].disks++;
-		sp[total].origsize += info.inf[0].size/unitdivisor;
-		sp[total].outsize += info.inf[0].csize/unitdivisor;
+		sp[total].origsize += info.inf[0].size/(off_t)unitdivisor;
+		sp[total].outsize += info.inf[0].csize/(off_t)unitdivisor;
 	    }
 	    
 	    /* See, if there's another run in this dumpcycle */
 	    fseq += disk_dumpcycle;
-	    seq = fseq;
+	    seq = (int)fseq;
 	} while (seq < later);
     }
 
-    if(sp[total].outsize == 0 && sp[later].outsize == 0) {
+    if(sp[total].outsize == (off_t)0 && sp[later].outsize == (off_t)0) {
 	printf("\nNo data to report on yet.\n");
 	amfree(sp);
 	return;
     }
 
-    balanced = sp[balance].outsize / runs_per_cycle;
+    balanced = sp[balance].outsize / (off_t)runs_per_cycle;
     if(conf_dumpcycle == later) {
-	total_balanced = sp[total].outsize / runs_per_cycle;
+	total_balanced = sp[total].outsize / (off_t)runs_per_cycle;
     }
     else {
-	total_balanced = 1024*(((sp[total].outsize/1024) * conf_dumpcycle)
-			    / (runs_per_cycle * later));
+	total_balanced = (((sp[total].outsize/(off_t)1024) * (off_t)conf_dumpcycle)
+			    / (off_t)(runs_per_cycle * later)) * (off_t)1024;
     }
 
     empty_day = 0;
@@ -938,35 +1040,46 @@ char **argv;
 		printf("\n");
 		empty_day = 0;
 	    }
-	    printf("%-9.9s  %3d %10ld %10ld ",
+	    printf("%-9.9s  %3d " OFF_T_FMT " " OFF_T_FMT " ",
 		   seqdatestr(seq), sp[seq].disks,
-		   sp[seq].origsize, sp[seq].outsize);
+		   (OFF_T_FMT_TYPE)sp[seq].origsize,
+		   (OFF_T_FMT_TYPE)sp[seq].outsize);
 	    if(!sp[seq].outsize) printf("     --- \n");
-	    else printf("%+8.1f%%\n",
-			(sp[seq].outsize-balanced)*100.0/(double)balanced);
+	    else printf("%+8.1lf%%\n",
+			(((double)sp[seq].outsize - (double)balanced) * 100.0 /
+			(double)balanced));
 	}
     }
 
     if(sp[later].disks != 0) {
-	printf("later      %3d %10ld %10ld ",
+	printf("later      %3d " OFF_T_FMT " " OFF_T_FMT " ",
 	       sp[later].disks,
-	       sp[later].origsize, sp[later].outsize);
+	       (OFF_T_FMT_TYPE)sp[later].origsize,
+	       (OFF_T_FMT_TYPE)sp[later].outsize);
 	if(!sp[later].outsize) printf("     --- \n");
-	else printf("%+8.1f%%\n",
-		    (sp[later].outsize-balanced)*100.0/(double)balanced);
+	else printf("%+8.1lf%%\n",
+		    (((double)sp[later].outsize - (double)balanced) * 100.0 /
+		    (double)balanced));
     }
     printf("----------------------------------------------\n");
-    printf("TOTAL      %3d %10ld %10ld %9ld\n", sp[total].disks,
-	   sp[total].origsize, sp[total].outsize, total_balanced);
+    printf("TOTAL      %3d " OFF_T_FMT " " OFF_T_FMT " " OFF_T_FMT "\n",
+	   sp[total].disks,
+	   (OFF_T_FMT_TYPE)sp[total].origsize,
+	   (OFF_T_FMT_TYPE)sp[total].outsize,
+	   (OFF_T_FMT_TYPE)total_balanced);
     if (sp[balance].origsize != sp[total].origsize ||
         sp[balance].outsize != sp[total].outsize ||
 	balanced != total_balanced) {
-	printf("BALANCED       %10ld %10ld %9ld\n",
-	       sp[balance].origsize, sp[balance].outsize, balanced);
+	printf("BALANCED       " OFF_T_FMT " " OFF_T_FMT " " OFF_T_FMT "\n",
+	       (OFF_T_FMT_TYPE)sp[balance].origsize,
+	       (OFF_T_FMT_TYPE)sp[balance].outsize,
+	       (OFF_T_FMT_TYPE)balanced);
     }
     if (sp[distinct].disks != sp[total].disks) {
-	printf("DISTINCT   %3d %10ld %10ld\n", sp[distinct].disks,
-	       sp[distinct].origsize, sp[distinct].outsize);
+	printf("DISTINCT   %3d " OFF_T_FMT " " OFF_T_FMT "\n",
+	       sp[distinct].disks,
+	       (OFF_T_FMT_TYPE)sp[distinct].origsize,
+	       (OFF_T_FMT_TYPE)sp[distinct].outsize);
     }
     printf("  (estimated %d run%s per dumpcycle)\n",
 	   runs_per_cycle, (runs_per_cycle == 1) ? "" : "s");
@@ -981,17 +1094,19 @@ char **argv;
 
 /* ----------------------------------------------- */
 
-void find(argc, argv)
-int argc;
-char **argv;
+void
+find(
+    int		argc,
+    char **	argv)
 {
     int start_argc;
     char *sort_order = NULL;
     find_result_t *output_find;
+    char *errstr;
 
     if(argc < 3) {
 	fprintf(stderr,
-		"%s: expecting \"find [--sort <hkdlb>] [hostname [<disk>]]*\"\n",
+		"%s: expecting \"find [--sort <hkdlpb>] [hostname [<disk>]]*\"\n",
 		get_pname());
 	usage();
     }
@@ -999,10 +1114,10 @@ char **argv;
 
     sort_order = newstralloc(sort_order, DEFAULT_SORT_ORDER);
     if(argc > 4 && strcmp(argv[3],"--sort") == 0) {
-	int i, valid_sort=1;
+	size_t i, valid_sort=1;
 
-	for(i=strlen(argv[4])-1;i>=0;i--) {
-	    switch (argv[4][i]) {
+	for(i = strlen(argv[4]); i > 0; i--) {
+	    switch (argv[4][i - 1]) {
 	    case 'h':
 	    case 'H':
 	    case 'k':
@@ -1011,6 +1126,8 @@ char **argv;
 	    case 'D':
 	    case 'l':
 	    case 'L':
+	    case 'p':
+	    case 'P':
 	    case 'b':
 	    case 'B':
 		    break;
@@ -1027,12 +1144,21 @@ char **argv;
     } else {
 	start_argc=4;
     }
-    match_disklist(diskqp, argc-(start_argc-1), argv+(start_argc-1));
-    output_find = find_dump(1, diskqp);
+    errstr = match_disklist(&diskq, argc-(start_argc-1), argv+(start_argc-1));
+    if (errstr) {
+	printf("%s", errstr);
+	amfree(errstr);
+    }
 
+    output_find = find_dump(1, &diskq);
     if(argc-(start_argc-1) > 0) {
 	free_find_result(&output_find);
-	match_disklist(diskqp, argc-(start_argc-1), argv+(start_argc-1));
+	errstr = match_disklist(&diskq, argc-(start_argc-1),
+					argv+(start_argc-1));
+	if (errstr) {
+	    printf("%s", errstr);
+	    amfree(errstr);
+	}
 	output_find = find_dump(0, NULL);
     }
 
@@ -1049,51 +1175,56 @@ char **argv;
 
 /* shared code with planner.c */
 
-int bump_thresh(level)
-int level;
+int
+bump_thresh(
+    int		level)
 {
     int bump = getconf_int(CNF_BUMPSIZE);
     double mult = getconf_real(CNF_BUMPMULT);
 
-    while(--level) bump = (int) bump * mult;
+    while(--level)
+	bump = (int)((double)bump * mult);
     return bump;
 }
 
-void bumpsize()
+void
+bumpsize(
+    int		argc,
+    char **	argv)
 {
     int l;
     int conf_bumppercent = getconf_int(CNF_BUMPPERCENT);
     double conf_bumpmult = getconf_real(CNF_BUMPMULT);
 
-    printf("Current bump parameters:\n");
+    (void)argc;	/* Quiet unused parameter warning */
+    (void)argv;	/* Quiet unused parameter warning */
 
+    printf("Current bump parameters:\n");
     if(conf_bumppercent == 0) {
 	printf("  bumpsize %5d KB\t- minimum savings (threshold) to bump level 1 -> 2\n",
 	       getconf_int(CNF_BUMPSIZE));
 	printf("  bumpdays %5d\t- minimum days at each level\n",
 	       getconf_int(CNF_BUMPDAYS));
-	printf("  bumpmult %5.5g\t- threshold = bumpsize * bumpmult**(level-1)\n\n",
+	printf("  bumpmult %5.5lg\t- threshold = bumpsize * bumpmult**(level-1)\n\n",
 	       conf_bumpmult);
 
 	printf("      Bump -> To  Threshold\n");
-	for(l = 1; l < 9; l++) {
+	for(l = 1; l < 9; l++)
 	    printf("\t%d  ->  %d  %9d KB\n", l, l+1, bump_thresh(l));
-	}
 	putchar('\n');
     }
     else {
-	double bumppercent = conf_bumppercent;
+	double bumppercent = (double)conf_bumppercent;
 
 	printf("  bumppercent %3d %%\t- minimum savings (threshold) to bump level 1 -> 2\n",
 	       conf_bumppercent);
 	printf("  bumpdays %5d\t- minimum days at each level\n",
 	       getconf_int(CNF_BUMPDAYS));
-	printf("  bumpmult %5.5g\t- threshold = disk_size * bumppercent * bumpmult**(level-1)\n\n",
+	printf("  bumpmult %5.5lg\t- threshold = disk_size * bumppercent * bumpmult**(level-1)\n\n",
 	       conf_bumpmult);
-
 	printf("      Bump -> To  Threshold\n");
 	for(l = 1; l < 9; l++) {
-	    printf("\t%d  ->  %d  %7.2f %%\n", l, l+1, bumppercent);
+	    printf("\t%d  ->  %d  %7.2lf %%\n", l, l+1, bumppercent);
 	    bumppercent *= conf_bumpmult;
 	    if(bumppercent >= 100.000) { bumppercent = 100.0;}
 	}
@@ -1103,11 +1234,12 @@ void bumpsize()
 
 /* ----------------------------------------------- */
 
-void export_one P((disk_t *dp));
+void export_one(disk_t *dp);
 
-void export_db(argc, argv)
-int argc;
-char **argv;
+void
+export_db(
+    int		argc,
+    char **	argv)
 {
     disk_t *dp;
     time_t curtime;
@@ -1117,30 +1249,30 @@ char **argv;
     printf("CURINFO Version %s CONF %s\n", version(), getconf_str(CNF_ORG));
 
     curtime = time(0);
-    if(gethostname(hostname, sizeof(hostname)-1) == -1) {
-	error("could not determine host name: %s", strerror(errno));
+    if(gethostname(hostname, SIZEOF(hostname)-1) == -1) {
+	error("could not determine host name: %s\n", strerror(errno));
+	/*NOTREACHED*/
     }
-    hostname[sizeof(hostname)-1] = '\0';
+    hostname[SIZEOF(hostname)-1] = '\0';
     printf("# Generated by:\n#    host: %s\n#    date: %s",
 	   hostname, ctime(&curtime));
 
     printf("#    command:");
-    for(i = 0; i < argc; i++) {
+    for(i = 0; i < argc; i++)
 	printf(" %s", argv[i]);
-    }
 
     printf("\n# This file can be merged back in with \"amadmin import\".\n");
     printf("# Edit only with care.\n");
 
-    if(argc >= 4) {
+    if(argc >= 4)
 	diskloop(argc, argv, "export", export_one);
-    } else for(dp = diskqp->head; dp != NULL; dp = dp->next) {
+    else for(dp = diskq.head; dp != NULL; dp = dp->next)
 	export_one(dp);
-    }
 }
 
-void export_one(dp)
-disk_t *dp;
+void
+export_one(
+    disk_t *	dp)
 {
     info_t info;
     int i,l;
@@ -1151,50 +1283,63 @@ disk_t *dp;
 	return;
     }
     printf("host: %s\ndisk: %s\n", dp->host->hostname, dp->name);
-    printf("command: %d\n", info.command);
+    printf("command: %u\n", info.command);
     printf("last_level: %d\n",info.last_level);
     printf("consecutive_runs: %d\n",info.consecutive_runs);
     printf("full-rate:");
-    for(i=0;i<AVG_COUNT;i++) printf(" %f", info.full.rate[i]);
+    for(i=0;i<AVG_COUNT;i++) printf(" %lf", info.full.rate[i]);
     printf("\nfull-comp:");
-    for(i=0;i<AVG_COUNT;i++) printf(" %f", info.full.comp[i]);
+    for(i=0;i<AVG_COUNT;i++) printf(" %lf", info.full.comp[i]);
 
     printf("\nincr-rate:");
-    for(i=0;i<AVG_COUNT;i++) printf(" %f", info.incr.rate[i]);
+    for(i=0;i<AVG_COUNT;i++) printf(" %lf", info.incr.rate[i]);
     printf("\nincr-comp:");
-    for(i=0;i<AVG_COUNT;i++) printf(" %f", info.incr.comp[i]);
+    for(i=0;i<AVG_COUNT;i++) printf(" %lf", info.incr.comp[i]);
     printf("\n");
     for(l=0;l<DUMP_LEVELS;l++) {
 	if(info.inf[l].date < (time_t)0 && info.inf[l].label[0] == '\0') continue;
-	printf("stats: %d %ld %ld %ld %ld %d %s\n", l,
-	       info.inf[l].size, info.inf[l].csize, info.inf[l].secs,
-	       (long)info.inf[l].date, info.inf[l].filenum,
+	printf("stats: %d " OFF_T_FMT " " OFF_T_FMT " " TIME_T_FMT " " TIME_T_FMT " " OFF_T_FMT " %s\n", l,
+	       (OFF_T_FMT_TYPE)info.inf[l].size,
+	       (OFF_T_FMT_TYPE)info.inf[l].csize,
+	       (TIME_T_FMT_TYPE)info.inf[l].secs,
+	       (TIME_T_FMT_TYPE)info.inf[l].date,
+	       (OFF_T_FMT_TYPE)info.inf[l].filenum,
 	       info.inf[l].label);
     }
     for(l=0;info.history[l].level > -1;l++) {
-	printf("history: %d %ld %ld %ld\n",info.history[l].level,
-	       info.history[l].size, info.history[l].csize,
-	       info.history[l].date);
+	printf("history: %d " OFF_T_FMT " " OFF_T_FMT " " TIME_T_FMT "\n",
+	       info.history[l].level,
+	       (OFF_T_FMT_TYPE)info.history[l].size,
+	       (OFF_T_FMT_TYPE)info.history[l].csize,
+	       (TIME_T_FMT_TYPE)info.history[l].date);
     }
     printf("//\n");
 }
 
 /* ----------------------------------------------- */
 
-int import_one P((void));
-char *impget_line P((void));
+int import_one(void);
+char *impget_line(void);
 
-void import_db(argc, argv)
-int argc;
-char **argv;
+void
+import_db(
+    int		argc,
+    char **	argv)
 {
-    int vers_maj, vers_min, vers_patch, newer;
+    int vers_maj;
+    int vers_min;
+    int vers_patch;
+    int newer;
     char *org;
     char *line = NULL;
     char *hdr;
     char *s;
+    int rc;
     int ch;
 
+    (void)argc;	/* Quiet unused parameter warning */
+    (void)argv;	/* Quiet unused parameter warning */
+
     /* process header line */
 
     if((line = agets(stdin)) == NULL) {
@@ -1207,10 +1352,10 @@ char **argv;
 
     hdr = "version";
 #define sc "CURINFO Version"
-    if(strncmp(s - 1, sc, sizeof(sc)-1) != 0) {
+    if(strncmp(s - 1, sc, SIZEOF(sc)-1) != 0) {
 	goto bad_header;
     }
-    s += sizeof(sc)-1;
+    s += SIZEOF(sc)-1;
     ch = *s++;
 #undef sc
     skip_whitespace(s, ch);
@@ -1241,10 +1386,10 @@ char **argv;
     hdr = "CONF";
     skip_whitespace(s, ch);			/* find the org keyword */
 #define sc "CONF"
-    if(ch == '\0' || strncmp(s - 1, sc, sizeof(sc)-1) != 0) {
+    if(ch == '\0' || strncmp(s - 1, sc, SIZEOF(sc)-1) != 0) {
 	goto bad_header;
     }
-    s += sizeof(sc)-1;
+    s += SIZEOF(sc)-1;
     ch = *s++;
 #undef sc
 
@@ -1255,6 +1400,7 @@ char **argv;
     }
     org = s - 1;
 
+    /*@ignore@*/
     newer = (vers_maj != VERSION_MAJOR)? vers_maj > VERSION_MAJOR :
 	    (vers_min != VERSION_MINOR)? vers_min > VERSION_MINOR :
 					 vers_patch > VERSION_PATCH;
@@ -1262,20 +1408,23 @@ char **argv;
 	fprintf(stderr,
 	     "%s: WARNING: input is from newer Amanda version: %d.%d.%d.\n",
 		get_pname(), vers_maj, vers_min, vers_patch);
+    /*@end@*/
 
     if(strcmp(org, getconf_str(CNF_ORG)) != 0) {
 	fprintf(stderr, "%s: WARNING: input is from different org: %s\n",
 		get_pname(), org);
     }
 
-    while(import_one());
+    do {
+    	rc = import_one();
+    } while (rc);
 
     amfree(line);
     return;
 
  bad_header:
 
-    amfree(line);
+    /*@i@*/ amfree(line);
     fprintf(stderr, "%s: bad CURINFO header line in input: %s.\n",
 	    get_pname(), hdr);
     fprintf(stderr, "    Was the input in \"amadmin export\" format?\n");
@@ -1283,24 +1432,27 @@ char **argv;
 }
 
 
-int import_one P((void))
+int
+import_one(void)
 {
     info_t info;
     stats_t onestat;
     int rc, level;
-    long onedate;
+    time_t onedate;
+    time_t *onedate_p = &onedate;
     char *line = NULL;
     char *s, *fp;
     int ch;
     int nb_history, i;
     char *hostname = NULL;
     char *diskname = NULL;
+    time_t *secs_p;
 
 #if TEXTDB
     check_dumpuser();
 #endif
 
-    memset(&info, 0, sizeof(info_t));
+    memset(&info, 0, SIZEOF(info_t));
 
     for(level = 0; level < DUMP_LEVELS; level++) {
         info.inf[level].date = (time_t)-1;
@@ -1316,8 +1468,8 @@ int import_one P((void))
 
     skip_whitespace(s, ch);
 #define sc "host:"
-    if(ch == '\0' || strncmp(s - 1, sc, sizeof(sc)-1) != 0) goto parse_err;
-    s += sizeof(sc)-1;
+    if(ch == '\0' || strncmp(s - 1, sc, SIZEOF(sc)-1) != 0) goto parse_err;
+    s += SIZEOF(sc)-1;
     ch = s[-1];
 #undef sc
     skip_whitespace(s, ch);
@@ -1326,7 +1478,7 @@ int import_one P((void))
     skip_non_whitespace(s, ch);
     s[-1] = '\0';
     hostname = stralloc(fp);
-    s[-1] = ch;
+    s[-1] = (char)ch;
 
     skip_whitespace(s, ch);
     while (ch == 0) {
@@ -1337,8 +1489,8 @@ int import_one P((void))
       skip_whitespace(s, ch);
     }
 #define sc "disk:"
-    if(strncmp(s - 1, sc, sizeof(sc)-1) != 0) goto parse_err;
-    s += sizeof(sc)-1;
+    if(strncmp(s - 1, sc, SIZEOF(sc)-1) != 0) goto parse_err;
+    s += SIZEOF(sc)-1;
     ch = s[-1];
 #undef sc
     skip_whitespace(s, ch);
@@ -1347,11 +1499,11 @@ int import_one P((void))
     skip_non_whitespace(s, ch);
     s[-1] = '\0';
     diskname = stralloc(fp);
-    s[-1] = ch;
+    s[-1] = (char)ch;
 
     amfree(line);
     if((line = impget_line()) == NULL) goto shortfile_err;
-    if(sscanf(line, "command: %d", &info.command) != 1) goto parse_err;
+    if(sscanf(line, "command: %u", &info.command) != 1) goto parse_err;
 
     /* get last_level and consecutive_runs */
 
@@ -1368,13 +1520,13 @@ int import_one P((void))
 
     /* get rate: and comp: lines for full dumps */
 
-    rc = sscanf(line, "full-rate: %f %f %f",
+    rc = sscanf(line, "full-rate: %lf %lf %lf",
 		&info.full.rate[0], &info.full.rate[1], &info.full.rate[2]);
     if(rc != 3) goto parse_err;
 
     amfree(line);
     if((line = impget_line()) == NULL) goto shortfile_err;
-    rc = sscanf(line, "full-comp: %f %f %f",
+    rc = sscanf(line, "full-comp: %lf %lf %lf",
 		&info.full.comp[0], &info.full.comp[1], &info.full.comp[2]);
     if(rc != 3) goto parse_err;
 
@@ -1382,13 +1534,13 @@ int import_one P((void))
 
     amfree(line);
     if((line = impget_line()) == NULL) goto shortfile_err;
-    rc = sscanf(line, "incr-rate: %f %f %f",
+    rc = sscanf(line, "incr-rate: %lf %lf %lf",
 		&info.incr.rate[0], &info.incr.rate[1], &info.incr.rate[2]);
     if(rc != 3) goto parse_err;
 
     amfree(line);
     if((line = impget_line()) == NULL) goto shortfile_err;
-    rc = sscanf(line, "incr-comp: %f %f %f",
+    rc = sscanf(line, "incr-comp: %lf %lf %lf",
 		&info.incr.comp[0], &info.incr.comp[1], &info.incr.comp[2]);
     if(rc != 3) goto parse_err;
 
@@ -1405,17 +1557,17 @@ int import_one P((void))
 	    /* end of record */
 	    break;
 	}
-	memset(&onestat, 0, sizeof(onestat));
+	memset(&onestat, 0, SIZEOF(onestat));
 
 	s = line;
 	ch = *s++;
 
 	skip_whitespace(s, ch);
 #define sc "stats:"
-	if(ch == '\0' || strncmp(s - 1, sc, sizeof(sc)-1) != 0) {
+	if(ch == '\0' || strncmp(s - 1, sc, SIZEOF(sc)-1) != 0) {
 	    goto parse_err;
 	}
-	s += sizeof(sc)-1;
+	s += SIZEOF(sc)-1;
 	ch = s[-1];
 #undef sc
 
@@ -1426,32 +1578,37 @@ int import_one P((void))
 	skip_integer(s, ch);
 
 	skip_whitespace(s, ch);
-	if(ch == '\0' || sscanf(s - 1, "%ld", &onestat.size) != 1) {
+	if(ch == '\0' || sscanf(s - 1, OFF_T_FMT,
+				(OFF_T_FMT_TYPE *)&onestat.size) != 1) {
 	    goto parse_err;
 	}
 	skip_integer(s, ch);
 
 	skip_whitespace(s, ch);
-	if(ch == '\0' || sscanf(s - 1, "%ld", &onestat.csize) != 1) {
+	if(ch == '\0' || sscanf(s - 1, OFF_T_FMT,
+				(OFF_T_FMT_TYPE *)&onestat.csize) != 1) {
 	    goto parse_err;
 	}
 	skip_integer(s, ch);
 
 	skip_whitespace(s, ch);
-	if(ch == '\0' || sscanf(s - 1, "%ld", &onestat.secs) != 1) {
+        secs_p = &onestat.secs;
+	if(ch == '\0' || sscanf(s - 1, TIME_T_FMT,
+				(TIME_T_FMT_TYPE *)secs_p) != 1) {
 	    goto parse_err;
 	}
 	skip_integer(s, ch);
 
 	skip_whitespace(s, ch);
-	if(ch == '\0' || sscanf(s - 1, "%ld", &onedate) != 1) {
+	if(ch == '\0' || sscanf(s - 1, TIME_T_FMT,
+				(TIME_T_FMT_TYPE *)onedate_p) != 1) {
 	    goto parse_err;
 	}
 	skip_integer(s, ch);
 
 	skip_whitespace(s, ch);
 	if(ch != '\0') {
-	    if(sscanf(s - 1, "%d", &onestat.filenum) != 1) {
+	    if(sscanf(s - 1, OFF_T_FMT, (OFF_T_FMT_TYPE *)&onestat.filenum) != 1) {
 		goto parse_err;
 	    }
 	    skip_integer(s, ch);
@@ -1462,38 +1619,39 @@ int import_one P((void))
 		    goto parse_err;
 		onestat.label[0] = '\0';
 	    } else {
-		strncpy(onestat.label, s - 1, sizeof(onestat.label)-1);
-		onestat.label[sizeof(onestat.label)-1] = '\0';
+		strncpy(onestat.label, s - 1, SIZEOF(onestat.label)-1);
+		onestat.label[SIZEOF(onestat.label)-1] = '\0';
 	    }
 	}
 
 	/* time_t not guarranteed to be long */
-	onestat.date = onedate;
+	/*@i1@*/ onestat.date = onedate;
 	if(level < 0 || level > 9) goto parse_err;
 
 	info.inf[level] = onestat;
     }
     nb_history = 0;
-    for(i=0;i<=NB_HISTORY+1;i++) {
+    for(i=0;i<=NB_HISTORY;i++) {
 	info.history[i].level = -2;
     }
     while(1) {
 	history_t onehistory;
-	long date;
+	time_t date;
+        time_t *date_p = &date;
 
 	if(line[0] == '/' && line[1] == '/') {
 	    info.history[nb_history].level = -2;
 	    rc = 0;
 	    break;
 	}
-	memset(&onehistory, 0, sizeof(onehistory));
+	memset(&onehistory, 0, SIZEOF(onehistory));
 	s = line;
 	ch = *s++;
 #define sc "history:"
-	if(strncmp(line, sc, sizeof(sc)-1) != 0) {
+	if(strncmp(line, sc, SIZEOF(sc)-1) != 0) {
 	    break;
 	}
-	s += sizeof(sc)-1;
+	s += SIZEOF(sc)-1;
 	ch = s[-1];
 #undef sc
 	skip_whitespace(s, ch);
@@ -1503,29 +1661,32 @@ int import_one P((void))
 	skip_integer(s, ch);
 
 	skip_whitespace(s, ch);
-	if(ch == '\0' || sscanf((s - 1), "%ld", &onehistory.size) != 1) {
+	if(ch == '\0' || sscanf((s - 1), OFF_T_FMT,
+				(OFF_T_FMT_TYPE *)&onehistory.size) != 1) {
 	    break;
 	}
 	skip_integer(s, ch);
 
 	skip_whitespace(s, ch);
-	if(ch == '\0' || sscanf((s - 1), "%ld", &onehistory.csize) != 1) {
+	if(ch == '\0' || sscanf((s - 1), OFF_T_FMT,
+				(OFF_T_FMT_TYPE *)&onehistory.csize) != 1) {
 	    break;
 	}
 	skip_integer(s, ch);
 
 	skip_whitespace(s, ch);
-	if(ch == '\0' || sscanf((s - 1), "%ld", &date) != 1) {
+	if((ch == '\0') || (sscanf((s - 1), TIME_T_FMT,
+				(TIME_T_FMT_TYPE *)date_p) != 1)) {
 	    break;
 	}
 	skip_integer(s, ch);
-	onehistory.date = date; /* time_t not guarranteed to be long */
+	/*@i1@*/onehistory.date = date; /* time_t not guarranteed to be long */
 
 	info.history[nb_history++] = onehistory;
 	amfree(line);
 	if((line = impget_line()) == NULL) goto shortfile_err;
     }
-    amfree(line);
+    /*@i@*/ amfree(line);
 
     /* got a full record, now write it out to the database */
 
@@ -1538,14 +1699,14 @@ int import_one P((void))
     return 1;
 
  parse_err:
-    amfree(line);
+    /*@i@*/ amfree(line);
     amfree(hostname);
     amfree(diskname);
     fprintf(stderr, "%s: parse error reading import record.\n", get_pname());
     return 0;
 
  shortfile_err:
-    amfree(line);
+    /*@i@*/ amfree(line);
     amfree(hostname);
     amfree(diskname);
     fprintf(stderr, "%s: short file reading import record.\n", get_pname());
@@ -1553,7 +1714,7 @@ int import_one P((void))
 }
 
 char *
-impget_line ()
+impget_line(void)
 {
     char *line;
     char *s;
@@ -1582,12 +1743,15 @@ impget_line ()
 
 /* ----------------------------------------------- */
 
-void disklist_one(dp)
-disk_t *dp;
+void
+disklist_one(
+    disk_t *	dp)
 {
     am_host_t *hp;
     interface_t *ip;
     sle_t *excl;
+    time_t st;
+    struct tm *stm;
 
     hp = dp->host;
     ip = hp->netif;
@@ -1597,7 +1761,6 @@ disk_t *dp;
     printf("    host %s:\n", hp->hostname);
     printf("        interface %s\n",
 	   ip->name[0] ? ip->name : "default");
-
     printf("    disk %s:\n", dp->name);
     if(dp->device) printf("        device %s\n", dp->device);
 
@@ -1632,18 +1795,19 @@ disk_t *dp;
 	}
 	printf("\n");
     }
-    printf("        priority %ld\n", dp->priority);
-    printf("        dumpcycle %ld\n", dp->dumpcycle);
+    printf("        priority %d\n", dp->priority);
+    printf("        dumpcycle %d\n", dp->dumpcycle);
     printf("        maxdumps %d\n", dp->maxdumps);
     printf("        maxpromoteday %d\n", dp->maxpromoteday);
     if(dp->bumppercent > 0) {
 	printf("        bumppercent %d\n", dp->bumppercent);
     }
     else {
-	printf("        bumpsize %d\n", dp->bumpsize);
+	printf("        bumpsize " OFF_T_FMT "\n",
+		(OFF_T_FMT_TYPE)dp->bumpsize);
     }
     printf("        bumpdays %d\n", dp->bumpdays);
-    printf("        bumpmult %f\n", dp->bumpmult);
+    printf("        bumpmult %lf\n", dp->bumpmult);
 
     printf("        strategy ");
     switch(dp->strategy) {
@@ -1699,39 +1863,107 @@ disk_t *dp;
 	break;
     }
     if(dp->compress != COMP_NONE) {
-	printf("        comprate %.2f %.2f\n",
+	printf("        comprate %.2lf %.2lf\n",
 	       dp->comprate[0], dp->comprate[1]);
     }
 
-    printf("        auth ");
-    switch(dp->auth) {
-    case AUTH_BSD:
-	printf("BSD\n");
+    printf("        encrypt ");
+    switch(dp->encrypt) {
+    case ENCRYPT_NONE:
+	printf("NONE\n");
+	break;
+    case ENCRYPT_CUST:
+	printf("CLIENT\n");
 	break;
-    case AUTH_KRB4:
-	printf("KRB4\n");
+    case ENCRYPT_SERV_CUST:
+	printf("SERVER\n");
 	break;
     }
+
+    printf("        auth %s\n", dp->security_driver);
     printf("        kencrypt %s\n", (dp->kencrypt? "YES" : "NO"));
+    printf("        amandad_path %s\n", dp->amandad_path);
+    printf("        client_username %s\n", dp->client_username);
+    printf("        ssh_keys %s\n", dp->ssh_keys);
+
+    printf("        holdingdisk ");
+    switch(dp->to_holdingdisk) {
+    case HOLD_NEVER:
+	printf("NEVER\n");
+	break;
+    case HOLD_AUTO:
+	printf("AUTO\n");
+	break;
+    case HOLD_REQUIRED:
+	printf("REQUIRED\n");
+	break;
+    }
 
-    printf("        holdingdisk %s\n", (!dp->no_hold? "YES" : "NO"));
     printf("        record %s\n", (dp->record? "YES" : "NO"));
     printf("        index %s\n", (dp->index? "YES" : "NO"));
+    st = dp->start_t;
+        if(st) {
+            stm = localtime(&st);
+	    if (stm) 
+		printf("        starttime %d:%02d:%02d\n",
+		       stm->tm_hour, stm->tm_min, stm->tm_sec);
+	    else
+		printf("        starttime BAD DATE\n");
+        }
+   
+    if(dp->tape_splitsize > (off_t)0) {
+	printf("        tape_splitsize " OFF_T_FMT "\n",
+	       (OFF_T_FMT_TYPE)dp->tape_splitsize);
+    }
+    if(dp->split_diskbuffer) {
+	printf("        split_diskbuffer %s\n", dp->split_diskbuffer);
+    }
+    if(dp->fallback_splitsize > (off_t)0) {
+	printf("        fallback_splitsize " OFF_T_FMT "Mb\n",
+	       (OFF_T_FMT_TYPE)(dp->fallback_splitsize / (off_t)1024));
+    }
     printf("        skip-incr %s\n", (dp->skip_incr? "YES" : "NO"));
     printf("        skip-full %s\n", (dp->skip_full? "YES" : "NO"));
+    printf("        spindle %d\n", dp->spindle);
 
     printf("\n");
 }
 
-void disklist(argc, argv)
-int argc;
-char **argv;
+void
+disklist(
+    int		argc,
+    char **	argv)
 {
     disk_t *dp;
 
     if(argc >= 4)
 	diskloop(argc, argv, "disklist", disklist_one);
     else
-	for(dp = diskqp->head; dp != NULL; dp = dp->next)
+	for(dp = diskq.head; dp != NULL; dp = dp->next)
 	    disklist_one(dp);
 }
+
+void
+show_version(
+    int		argc,
+    char **	argv)
+{
+    int i;
+
+    (void)argc;	/* Quiet unused parameter warning */
+    (void)argv;	/* Quiet unused parameter warning */
+
+    for(i = 0; version_info[i] != NULL; i++)
+	printf("%s", version_info[i]);
+}
+
+
+void show_config(
+    int argc,
+    char **argv)
+{
+    argc = argc;
+    argv = argv;
+    dump_configuration(conffile);
+}
+