Fixed a bug causing dump to stop and report an error if an inode number in the exclud...

diff --git a/CHANGES b/CHANGES
index dc1f61365979b353cdf3c3dc974f5c7956dcab42..e6dd0f75b1165d97e9f0b802c151fa2c858e48f4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.195 2002/09/02 12:43:12 stelian Exp $
+$Id: CHANGES,v 1.196 2002/10/07 19:27:35 stelian Exp $

 
 Changes between versions 0.4b31 and 0.4b32 (released ?????????????)
 ===================================================================
 
 Changes between versions 0.4b31 and 0.4b32 (released ?????????????)
 ===================================================================


@@ -24,6 +24,11 @@ Changes between versions 0.4b31 and 0.4b32 (released ?????????????)
        this for proper operation. Thanks to Dirk Traenapp
        <dtraenapp@users.sourceforge.net> for reporting this.
 
        this for proper operation. Thanks to Dirk Traenapp
        <dtraenapp@users.sourceforge.net> for reporting this.
 

+5.     Fixed a bug causing Dump to stop and report an error if an
+       inode number in the exclude file was followed by some amount
+       of whitespace. Thanks to Jeffrey Sofferin 
+       <sofferin@users.sourceforge.net> for reporting this bug.
+

 Changes between versions 0.4b30 and 0.4b31 (released July 30, 2002)
 ===================================================================
 
 Changes between versions 0.4b30 and 0.4b31 (released July 30, 2002)
 ===================================================================
 

diff --git a/THANKS b/THANKS
index a4a6ea3d5ee2de425a0c385325831723c49f25d5..37aaaae83730484575f562a2efdf6994e0063c26 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.67 2002/09/02 12:44:03 stelian Exp $
+$Id: THANKS,v 1.68 2002/10/07 19:27:35 stelian Exp $

 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.
 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.


@@ -89,6 +89,7 @@ Gunther Schlegel      schlegel@riege.de
 Chris Siebenmann       cks@utcc.utoronto.ca
 Paul Slootman          paul@debian.org
 Bob Snyder             rsnyder@janet.advsys.com
 Chris Siebenmann       cks@utcc.utoronto.ca
 Paul Slootman          paul@debian.org
 Bob Snyder             rsnyder@janet.advsys.com

+Jeffrey Sofferin       sofferin@users.sourceforge.net

 Gabriel Somlo          somlo@cs.colostate.edu
 Clemens Stiglechner    a9401816@unet.univie.ac.at
 Matti Taskinen         mkt@rni.helsinki.fi
 Gabriel Somlo          somlo@cs.colostate.edu
 Clemens Stiglechner    a9401816@unet.univie.ac.at
 Matti Taskinen         mkt@rni.helsinki.fi

diff --git a/dump/main.c b/dump/main.c
index ebfab4fd22c77b659183392ecfb0e832c139287e..7f46e753e5fd1ba49539a2e9eb8da3b4d6b72fe5 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: main.c,v 1.75 2002/09/02 12:43:12 stelian Exp $";
+       "$Id: main.c,v 1.76 2002/10/07 19:27:36 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -1241,7 +1241,7 @@ do_exclude_ino_str(char * ino) {
        unsigned long inod;
 
        inod = strtoul(ino, &r, 10);
        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);
                msg("Invalid inode argument %s\n", ino);
                msg("The ENTIRE dump is aborted.\n");
                exit(X_STARTUP);