Fixed the remote tape/file detection in restore.

[dump.git] / restore / main.c

diff --git a/restore/main.c b/restore/main.c
index 3feca826338866a97364a94d7555baa6538e1624..8862d0da03d1b7dc4239a608312a874fd666302c 100644 (file)
--- a/restore/main.c
+++ b/restore/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.28 2001/08/14 13:11:58 stelian Exp $";
+       "$Id: main.c,v 1.32 2001/11/16 14:09:07 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -81,8 +81,8 @@ static const char rcsid[] =
 #include "extern.h"
 
 int    bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
-int    hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, zflag = 0;
-int    uflag = 0;
+int    hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, Vflag = 0, zflag = 0;
+int    uflag = 0, lflag = 0;
 int    dokerberos = 0;
 char   command = '\0';
 long   dumpnum = 1;
@@ -158,11 +158,11 @@ main(int argc, char *argv[])
 #ifdef KERBEROS
                "k"
 #endif
-               "mMN"
+               "lmMN"
 #ifdef USE_QFA
                "Q:"
 #endif
-               "Rrs:tT:uvxX:y")) != -1)
+               "Rrs:tT:uvVxX:y")) != -1)
                switch(ch) {
                case 'b':
                        /* Change default tape blocksize. */
@@ -214,6 +214,9 @@ main(int argc, char *argv[])
                                    ch, command);
                        command = ch;
                        break;
+               case 'l':
+                       lflag = 1;
+                       break;
                case 'm':
                        mflag = 0;
                        break;
@@ -243,6 +246,9 @@ main(int argc, char *argv[])
                case 'v':
                        vflag = 1;
                        break;
+               case 'V':
+                       Vflag = 1;
+                       break;
                case 'X':
                        if( !strcmp(optarg,"-") ) {
                                use_stdin("-X");
@@ -277,7 +283,11 @@ main(int argc, char *argv[])
 
        atexit(cleanup);
 
-       if (command == 'C' && inputdev[0] != '/') {
+       if (command == 'C' && inputdev[0] != '/' && strcmp(inputdev, "-")
+#ifdef RRESTORE
+           && !strchr(inputdev, ':')
+#endif
+         ) {
                /* since we chdir into the directory we are comparing
                 * to, we must retain the full tape path */
                char wd[MAXPATHLEN], fullpathinput[MAXPATHLEN];
@@ -285,7 +295,6 @@ main(int argc, char *argv[])
                        err(1, "can't get current directory");
                snprintf(fullpathinput, MAXPATHLEN, "%s/%s", wd, inputdev);
                fullpathinput[MAXPATHLEN - 1] = '\0';
-printf("FULLPATH is %s\n", fullpathinput);
                setinput(fullpathinput);
        }
        else
@@ -525,12 +534,12 @@ usage(void)
 
        (void)fprintf(stderr,
          "usage:\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n",
-         __progname, " -C [-c" kerbflag "Mvy] [-b blocksize] [-D filesystem] [-f file] [-F script] [-s fileno]",
-         __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno]",
-         __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
-         __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
-         __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]",
-         __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]");
+         __progname, " -C [-c" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file] [-F script] [-s fileno]",
+         __progname, " -i [-ch" kerbflag "lmMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno]",
+         __progname, " -r [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
+         __progname, " -R [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
+         __progname, " -t [-ch" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]",
+         __progname, " -x [-ch" kerbflag "lmMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]");
        exit(1);
 }