Changed two info messages of restore to be written on stdout instead of stderr.

[dump.git] / restore / main.c

diff --git a/restore/main.c b/restore/main.c
index 292d0cc11d35aab429d2d3501f2194f49c1aae0f..344ec5cacf0567ea5561991e30dbc4473e033a9d 100644 (file)
--- a/restore/main.c
+++ b/restore/main.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.9 2000/03/02 11:34:51 stelian Exp $";
+       "$Id: main.c,v 1.12 2000/05/28 16:52:21 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -87,7 +87,9 @@ time_t        dumpdate;
 FILE   *terminal;
 char   *tmpdir;
 int    compare_ignore_not_found;
+int    compare_errors;
 char   filesys[NAMELEN];
+static const char *stdin_opt = NULL;
 
 #ifdef __linux__
 char   *__progname;
@@ -95,6 +97,7 @@ char  *__progname;
 
 static void obsolete __P((int *, char **[]));
 static void usage __P((void));
+static void use_stdin __P((const char *));
 
 int
 main(int argc, char *argv[])
@@ -104,6 +107,8 @@ main(int argc, char *argv[])
        char *inputdev = _PATH_DEFTAPE;
        char *symtbl = "./restoresymtable";
        char *p, name[MAXPATHLEN];
+       FILE *filelist = NULL;
+       char fname[MAXPATHLEN];
 
        /* Temp files should *not* be readable.  We set permissions later. */
        (void) umask(077);
@@ -125,9 +130,9 @@ main(int argc, char *argv[])
                ;                                                               
        obsolete(&argc, &argv);
 #ifdef KERBEROS
-#define        optlist "b:CcdD:f:hikmMNRrs:tT:uvxy"
+#define        optlist "b:CcdD:f:hikmMNRrs:tT:uvxX:y"
 #else
-#define        optlist "b:CcdD:f:himMNRrs:tT:uvxy"
+#define        optlist "b:CcdD:f:himMNRrs:tT:uvxX:y"
 #endif
        while ((ch = getopt(argc, argv, optlist)) != -1)
                switch(ch) {
@@ -154,6 +159,8 @@ main(int argc, char *argv[])
                        dflag = 1;
                        break;
                case 'f':
+                       if( !strcmp(optarg,"-") )
+                               use_stdin("-f");
                        inputdev = optarg;
                        break;
                case 'h':
@@ -199,6 +206,15 @@ main(int argc, char *argv[])
                case 'v':
                        vflag = 1;
                        break;
+               case 'X':
+                       if( !strcmp(optarg,"-") ) {
+                               use_stdin("-X");
+                               filelist = stdin;
+                       }
+                       else
+                               if ( !(filelist = fopen(optarg,"r")) )
+                                       errx(1, "can't open file for reading -- %s", optarg);
+                       break;
                case 'y':
                        yflag = 1;
                        break;
@@ -221,7 +237,7 @@ main(int argc, char *argv[])
 
        setinput(inputdev);
 
-       if (argc == 0) {
+       if (argc == 0 && !filelist) {
                argc = 1;
                *--argv = ".";
        }
@@ -235,6 +251,7 @@ main(int argc, char *argv[])
 
                Vprintf(stdout, "Begin compare restore\n");
                compare_ignore_not_found = 0;
+               compare_errors = 0;
                setup();
                printf("filesys = %s\n", filesys);
                if (stat(filesys, &stbuf) < 0)
@@ -247,6 +264,10 @@ main(int argc, char *argv[])
                treescan(".", ROOTINO, nodeupdates);
                compareleaves();
                checkrestore();
+               if (compare_errors) {
+                       printf("Some files were modified!\n");
+                       exit(2);
+               }
                break;
        }
 
@@ -309,6 +330,23 @@ main(int argc, char *argv[])
                checkrestore();
                dumpsymtable(symtbl, (long)1);
                break;
+       
+/* handle file names from either text file (-X) or the command line */
+#define NEXTFILE(p) \
+       p = NULL; \
+       if (argc) { \
+               --argc; \
+               p = *argv++; \
+       } \
+       else if (filelist) { \
+               if ((p = fgets(fname, MAXPATHLEN, filelist))) { \
+                       if ( *p && *(p + strlen(p) - 1) == '\n' ) /* possible null string */ \
+                               *(p + strlen(p) - 1) = '\0'; \
+                       if ( !*p ) /* skip empty lines */ \
+                               continue; \
+                       } \
+       }
+       
        /*
         * List contents of tape.
         */
@@ -316,8 +354,11 @@ main(int argc, char *argv[])
                setup();
                extractdirs(0);
                initsymtable((char *)0);
-               while (argc--) {
-                       canon(*argv++, name, sizeof(name));
+               for (;;) {
+                       NEXTFILE(p);
+                       if (!p)
+                               break;
+                       canon(p, name, sizeof(name));
                        ino = dirlookup(name);
                        if (ino == 0)
                                continue;
@@ -331,8 +372,11 @@ main(int argc, char *argv[])
                setup();
                extractdirs(1);
                initsymtable((char *)0);
-               while (argc--) {
-                       canon(*argv++, name, sizeof(name));
+               for (;;) {
+                       NEXTFILE(p);
+                       if (!p)
+                               break;
+                       canon(p, name, sizeof(name));
                        ino = dirlookup(name);
                        if (ino == 0)
                                continue;
@@ -367,8 +411,8 @@ usage(void)
          __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno]",
          __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno]",
          __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno]",
-         __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno] [file ...]",
-         __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [file ...]");
+         __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]",
+         __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]");
        exit(1);
 }
 
@@ -407,6 +451,7 @@ obsolete(int *argcp, char **argvp[])
                case 'f':
                case 's':
                case 'T':
+               case 'X':
                        if (*argv == NULL) {
                                warnx("option requires an argument -- %c", *ap);
                                usage();
@@ -441,3 +486,16 @@ obsolete(int *argcp, char **argvp[])
        /* Update argument count. */
        *argcp = nargv - *argvp - 1;
 }
+
+/*
+ * use_stdin --
+ *     reserve stdin for opt (avoid conflicts)
+ */
+void
+use_stdin(const char *opt)
+{
+       if (stdin_opt)
+               errx(1, "can't handle standard input for both %s and %s",
+                       stdin_opt, opt);
+       stdin_opt = opt;
+}