Added inode 7 to exclude list -> Excluding inode 7 (resize inode) from dump

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index 3ef7bc1930aef7658892ad93cb92d6bdfdb46eec..508ec15fab28d3734a7e8bcc90b6535ffef42bf6 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.73 2002/07/17 10:18:52 stelian Exp $";
+       "$Id: main.c,v 1.77 2002/11/15 09:49:40 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -181,7 +181,7 @@ long        uncomprblks = 0;/* uncompressed blocks written */
 char   *__progname;
 #endif
 
-int    maxbsize = 64*1024;     /* XXX MAXBSIZE from sys/param.h */
+int    maxbsize = 1024*1024;     /* XXX MAXBSIZE from sys/param.h */
 static long numarg __P((const char *, long, long));
 static void obsolete __P((int *, char **[]));
 static void usage __P((void));
@@ -293,7 +293,7 @@ main(int argc, char *argv[])
 
                case 'b':               /* blocks per tape write */
                        ntrec = numarg("number of blocks per write",
-                           1L, 1000L);
+                           1L, 1048576L);
                        if (ntrec > maxbsize/1024) {
                                msg("Please choose a blocksize <= %dkB\n",
                                        maxbsize/1024);
@@ -879,10 +879,10 @@ main(int argc, char *argv[])
                /* print QFA-file header */
                snprintf(gTps, sizeof(gTps), "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION, (unsigned long)spcl.c_date);
                gTps[sizeof(gTps) - 1] = '\0';
-               if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+               if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps))
                        quit("can't write tapeposfile\n");
                sprintf(gTps, "ino\ttapeno\ttapepos\n");
-               if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+               if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps))
                        quit("can't write tapeposfile\n");
        }
 #endif /* USE_QFA */
@@ -1227,10 +1227,10 @@ do_exclude_ino(dump_ino_t ino, const char *reason)
                        exit(X_STARTUP);
                }
                if (reason)
-                       msg("Added inode %u to exclude list (%s)\n", 
+                       msg("Excluding inode %u (%s) from dump\n", 
                            ino, reason);
                else
-                       msg("Added inode %u to exclude list\n", ino);
+                       msg("Excluding inode %u from dump\n", ino);
                iexclude_list[iexclude_num++] = ino;
        }
 }
@@ -1241,7 +1241,7 @@ do_exclude_ino_str(char * ino) {
        unsigned long inod;
 
        inod = strtoul(ino, &r, 10);
-       if (*r != '\0' || inod <= ROOTINO) {
+       if (( *r != '\0' && !isspace(*r) ) || inod <= ROOTINO) {
                msg("Invalid inode argument %s\n", ino);
                msg("The ENTIRE dump is aborted.\n");
                exit(X_STARTUP);