Fixed restore -C -f -

diff --git a/CHANGES b/CHANGES
index cdb7894f6766e763c41a38c6f542abc9d5133e5b..a3d79529bbc9abefd90cb0e3c0e02fecd04bf76f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.141 2001/11/11 00:06:39 stelian Exp $
+$Id: CHANGES,v 1.142 2001/11/13 12:11:05 stelian Exp $
 
 Changes between versions 0.4b24 and 0.4b25 (released ??????????????????)
 ========================================================================
@@ -17,6 +17,10 @@ Changes between versions 0.4b24 and 0.4b25 (released ??????????????????)
        which allows BRADEMAX (number of read errors tolerated by
        dump) to be adjusted using the -I option.
 
+5.     Fixed a bug which disabled doing "restore -C -f -". Thanks
+        to Clemens Stiglechner <a9401816@unet.univie.ac.at> for the
+       patch.
+
 Changes between versions 0.4b23 and 0.4b24 (released September 12, 2001)
 ========================================================================
 

diff --git a/THANKS b/THANKS
index 9336679a2637d49982642fe8e03fbb0875d7720f..c61f2f000cdfdb6af15764c25c761d7d8bd40933 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.48 2001/11/11 00:06:39 stelian Exp $
+$Id: THANKS,v 1.49 2001/11/13 12:11:05 stelian Exp $
 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.
@@ -74,6 +74,7 @@ Chris Siebenmann      cks@utcc.utoronto.ca
 Paul Slootman          paul@debian.org
 Bob Snyder             rsnyder@janet.advsys.com
 Gabriel Somlo          somlo@cs.colostate.edu
+Clemens Stiglechner    a9401816@unet.univie.ac.at
 Matti Taskinen         mkt@rni.helsinki.fi
 Jason L Tibbitts III   tibbs@math.uh.edu
 Mike Tibor             tibor@lib.uaa.alaska.edu

diff --git a/restore/main.c b/restore/main.c
index 8368548dbc6d404e7466b490a949e3807f59adbf..37d710150c9dbb0096dab0ee96c79f7d28c2bb59 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.29 2001/09/12 10:21:49 stelian Exp $";
+       "$Id: main.c,v 1.30 2001/11/13 12:11:05 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -280,7 +280,7 @@ main(int argc, char *argv[])
 
        atexit(cleanup);
 
-       if (command == 'C' && inputdev[0] != '/') {
+       if (command == 'C' && inputdev[0] != '/' && strcmp(inputdev, "-")) {
                /* since we chdir into the directory we are comparing
                 * to, we must retain the full tape path */
                char wd[MAXPATHLEN], fullpathinput[MAXPATHLEN];