Implemented a -M(ulti volume) option for dump.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index 1dc780d210ef662256706cd492000de71578082d..5e8f79f2a45bb7fe19b889456191453cb09acd55 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -3,7 +3,6 @@
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Stelian Pop <pop@cybercable.fr>, 1999 
- *
  */
 
 /*-
@@ -37,10 +36,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $Id: main.c,v 1.5 1999/10/11 13:31:11 stelian Exp $
  */
 
+#ifndef lint
+static const char rcsid[] =
+       "$Id: main.c,v 1.8 1999/11/21 16:01:47 tiniou Exp $";
+#endif /* not lint */
+
 #include <sys/param.h>
 #include <sys/time.h>
 #ifdef __linux__
@@ -135,8 +137,8 @@ main(int argc, char *argv[])
 #endif
 
        tsize = 0;      /* Default later, based on 'c' option for cart tapes */
-       if ((tape = getenv("TAPE")) == NULL)
-               tape = _PATH_DEFTAPE;
+       if ((tapeprefix = getenv("TAPE")) == NULL)
+               tapeprefix = _PATH_DEFTAPE;
        dumpdates = _PATH_DUMPDATES;
        temp = _PATH_DTMP;
        strcpy(labelstr, "none");       /* XXX safe strcpy. */
@@ -149,9 +151,9 @@ main(int argc, char *argv[])
 
        obsolete(&argc, &argv);
 #ifdef KERBEROS
-#define optstring "0123456789aB:b:cd:f:h:kL:ns:T:uWw"
+#define optstring "0123456789aB:b:cd:f:h:kL:Mns:T:uWw"
 #else
-#define optstring "0123456789aB:b:cd:f:h:L:ns:T:uWw"
+#define optstring "0123456789aB:b:cd:f:h:L:Mns:T:uWw"
 #endif
        while ((ch = getopt(argc, argv, optstring)) != -1)
 #undef optstring
@@ -193,7 +195,7 @@ main(int argc, char *argv[])
                        break;
 
                case 'f':               /* output file */
-                       tape = optarg;
+                       tapeprefix = optarg;
                        break;
 
                case 'h':
@@ -223,6 +225,10 @@ main(int argc, char *argv[])
                        }
                        break;
 
+               case 'M':               /* multi-volume flag */
+                       Mflag = 1;
+                       break;
+
                case 'n':               /* notify operators */
                        notify = 1;
                        break;
@@ -275,9 +281,9 @@ main(int argc, char *argv[])
                    "You cannot use the T and u flags together.\n");
                exit(X_STARTUP);
        }
-       if (strcmp(tape, "-") == 0) {
+       if (strcmp(tapeprefix, "-") == 0) {
                pipeout++;
-               tape = "standard output";
+               tapeprefix = "standard output";
        }
 
        if (blocksperfile)
@@ -299,12 +305,12 @@ main(int argc, char *argv[])
                        tsize = cartridge ? 1700L*120L : 2300L*120L;
        }
 
-       if (strchr(tape, ':')) {
-               host = tape;
-               tape = strchr(host, ':');
-               *tape++ = '\0';
+       if (strchr(tapeprefix, ':')) {
+               host = tapeprefix;
+               tapeprefix = strchr(host, ':');
+               *tapeprefix++ = '\0';
 #ifdef RDUMP
-               if (index(tape, '\n')) {
+               if (index(tapeprefix, '\n')) {
                    (void)fprintf(stderr, "invalid characters in tape\n");
                    exit(X_STARTUP);
                }
@@ -390,6 +396,12 @@ main(int argc, char *argv[])
                spcl.c_level = 0;
        }
 
+       if (Mflag)
+               snprintf(tape, NAME_MAX, "%s%03d", tapeprefix, tapeno + 1);
+       else
+               strncpy(tape, tapeprefix, NAME_MAX);
+       tape[NAME_MAX - 1] = '\0';
+
        msg("Date of this level %c dump: %s", level,
 #ifdef __linux__
                spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
@@ -412,7 +424,7 @@ main(int argc, char *argv[])
        msg("Label: %s\n", labelstr);
 
 #ifdef __linux__
-       retval = ext2fs_open(disk, 0, 0, 0, unix_io_manager, &fs);
+       retval = dump_fs_open(disk, &fs);
        if (retval) {
                com_err(disk, retval, "while opening filesystem");
                if (retval == EXT2_ET_REV_TOO_HIGH)
@@ -639,14 +651,24 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
+       char white[MAXPATHLEN];
+       int i;
+       
+       strncpy(white, __progname, MAXPATHLEN-1);
+       white[MAXPATHLEN-1] = '\0';
+       for (i=0; i<MAXPATHLEN; ++i)
+               if (white[i] != '\0') white[i] = ' ';
+
+       fprintf(stderr,
+               "%s %s\n", __progname, _DUMP_VERSION);
        fprintf(stderr,
-               "usage: %s [-0123456789ac"
+               "usage:\t%s [-0123456789ac"
 #ifdef KERBEROS
                "k"
 #endif
-               "nu] [-B records] [-b blocksize] [-d density] [-f file]\n"
-               "            [-h level] [-s feet] [-T date] filesystem\n"
-               "       %s [-W | -w]\n", __progname, __progname);
+               "Mnu] [-B records] [-b blocksize] [-d density]\n"
+               "\t%s [-f file] [-h level] [-s feet] [-T date] filesystem\n"
+               "\t%s [-W | -w]\n", __progname, white, __progname);
        exit(X_STARTUP);
 }