Fix dump output message when using default level.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index a0fa718b764cda5f1291d0ad309bdd6ff87cc143..b3bbf7d4a45058bb38a815112b8430f6fb2fe3f1 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.91 2004/01/27 10:46:55 stelian Exp $";
+       "$Id: main.c,v 1.95 2009/06/18 09:35:14 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -58,6 +58,7 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <time.h>
 #ifdef __linux__
+#include <linux/types.h>
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
 #else
@@ -103,8 +104,8 @@ const char *disk;   /* name of the disk file */
 char   tape[MAXPATHLEN];/* name of the tape file */
 char   *tapeprefix;    /* prefix of the tape file */
 char   *dumpdates;     /* name of the file containing dump date information*/
-char   lastlevel;      /* dump level of previous dump */
-char   level;          /* dump level of this dump */
+char   lastlevel[NUM_STR_SIZE];/* dump level of previous dump */
+char   level[NUM_STR_SIZE];/* dump level of this dump */
 int    zipflag;        /* which compression method */
 int    Afile = -1;     /* archive file descriptor */
 int    AfileActive = 1;/* Afile flag */
@@ -204,7 +205,7 @@ main(int argc, char *argv[])
        struct dinode *dp;
        struct mntent *dt;
        char *map;
-       int ch;
+       int ch, pch = 0;
        int i, anydirskipped;
        int aflag = 0, bflag = 0, Tflag = 0, honorlevel = 1;
        dump_ino_t maxino;
@@ -236,7 +237,10 @@ main(int argc, char *argv[])
        dumpdates = _PATH_DUMPDATES;
        if (TP_BSIZE / DEV_BSIZE == 0 || TP_BSIZE % DEV_BSIZE != 0)
                quit("TP_BSIZE must be a multiple of DEV_BSIZE\n");
-       level = '0';
+       memset(&lastlevel, 0, NUM_STR_SIZE);
+       memset(&level, 0, NUM_STR_SIZE);
+       /* Default dump level is zero. */
+       level[0] = '0';
 
        if (argc < 2)
                usage();
@@ -272,7 +276,11 @@ main(int argc, char *argv[])
                /* dump level */
                case '0': case '1': case '2': case '3': case '4':
                case '5': case '6': case '7': case '8': case '9':
-                       level = ch;
+                       if ((pch >= '0') && (pch <= '9') && (strlen(level) < NUM_STR_SIZE))
+                               level[strlen(level)] = ch;
+                       else 
+                               level[0] = ch;
+                       pch = ch;
                        break;
 
                case 'A':               /* archive file */
@@ -424,7 +432,7 @@ main(int argc, char *argv[])
                                exit(X_STARTUP);
                        }
                        Tflag = 1;
-                       lastlevel = '?';
+                       lastlevel[0] = '?'; lastlevel[1] = '\0'; 
                        break;
 
                case 'u':               /* update dumpdates */
@@ -578,13 +586,9 @@ main(int argc, char *argv[])
                        diskparam[i] = '\0';
 
        disk = get_device_name(diskparam);
-       if (!disk) {            /* null means the disk is some form
-                                  of LABEL= or UID= but it was not
-                                  found */
-               msg("Cannot find a disk having %s\n", diskparam);
-               msg("The ENTIRE dump is aborted.\n");
-               exit(X_STARTUP);
-       }
+       if (!disk)
+               disk = strdup(diskparam);
+
        /*
         *      disk can be either the full special file name,
         *      the suffix of the special file name,
@@ -646,7 +650,7 @@ main(int argc, char *argv[])
        }
 
        if (directory[0] != 0) {
-               if (level != '0') {
+               if (atoi(level) != 0) {
                        msg("Only level 0 dumps are allowed on a subdirectory\n");
                        msg("The ENTIRE dump is aborted.\n");
                        exit(X_STARTUP);
@@ -661,7 +665,7 @@ main(int argc, char *argv[])
        spcl.c_filesys[NAMELEN-1] = '\0';
        (void)gethostname(spcl.c_host, NAMELEN);
        spcl.c_host[NAMELEN-1] = '\0';
-       spcl.c_level = level - '0';
+       spcl.c_level = atoi(level);
        spcl.c_type = TS_TAPE;
        if (!Tflag)
                getdumptime(uflag);             /* dumpdates snarfed */
@@ -669,7 +673,7 @@ main(int argc, char *argv[])
        if (spcl.c_ddate == 0 && spcl.c_level) {
                msg("WARNING: There is no inferior level dump on this filesystem\n"); 
                msg("WARNING: Assuming a level 0 dump by default\n");
-               level = '0';
+               level[0] = '0'; level[1] = '\0';
                spcl.c_level = 0;
        }
 
@@ -686,13 +690,13 @@ main(int argc, char *argv[])
 
        if (!sizest) {
 
-               msg("Date of this level %c dump: %s", level,
+               msg("Date of this level %s dump: %s", level,
                    ctime4(&spcl.c_date));
 #ifdef USE_QFA
                gThisDumpDate = spcl.c_date;
 #endif
                if (spcl.c_ddate)
-                       msg("Date of last level %c dump: %s", lastlevel,
+                       msg("Date of last level %s dump: %s", lastlevel,
                            ctime4(&spcl.c_ddate));
                msg("Dumping %s (%s) ", disk, spcl.c_filesys);
                if (host)
@@ -1046,7 +1050,7 @@ main(int argc, char *argv[])
                    spcl.c_tapea / (tend_writing - tstart_writing));
 
        putdumptime();
-       msg("Date of this level %c dump: %s", level,
+       msg("Date of this level %s dump: %s", level,
                spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
        msg("Date this dump completed:  %s", ctime(&tnow));
 
@@ -1085,7 +1089,7 @@ usage(void)
        fprintf(stderr, "%s %s\n", __progname, _DUMP_VERSION);
 #endif
        fprintf(stderr,
-               "usage:\t%s [-0123456789ac"
+               "usage:\t%s [-level#] [-ac"
 #ifdef KERBEROS
                "k"
 #endif