From: Stelian Pop <stelian@popies.net>
Date: Tue, 13 Nov 2001 12:11:05 +0000 (+0000)
Subject: Fixed restore -C -f -
X-Git-Tag: release_0_4b25~6
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f9e97496bec48c54850cc4e576ac9f4dcd7e2802;p=dump.git

Fixed restore -C -f -
---

diff --git a/CHANGES b/CHANGES
index cdb7894..a3d7952 100644
--- 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 9336679..c61f2f0 100644
--- 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 8368548..37d7101 100644
--- 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];