X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Fmain.c;h=8862d0da03d1b7dc4239a608312a874fd666302c;hb=132daf888086bd9816955545c6b6073440cf8b60;hp=8b6b08e0a57b7b4cad9ccf47698771a284e26749;hpb=b8f7cbe65e70f2ec792c447995ba00ca360ec0c9;p=dump.git

diff --git a/restore/main.c b/restore/main.c
index 8b6b08e..8862d0d 100644
--- a/restore/main.c
+++ b/restore/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.26 2001/07/18 13:12:33 stelian Exp $";
+	"$Id: main.c,v 1.32 2001/11/16 14:09:07 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -81,8 +81,8 @@ static const char rcsid[] =
 #include "extern.h"
 
 int	bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
-int	hflag = 1, mflag = 1, Nflag = 0, zflag = 0;
-int	uflag = 0;
+int	hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, Vflag = 0, zflag = 0;
+int	uflag = 0, lflag = 0;
 int	dokerberos = 0;
 char	command = '\0';
 long	dumpnum = 1;
@@ -101,6 +101,14 @@ char	filesys[NAMELEN];
 static const char *stdin_opt = NULL;
 char	*bot_script = NULL;
 
+#ifdef USE_QFA
+FILE	*gTapeposfp;
+char	*gTapeposfile;
+char	gTps[255];
+long	gSeekstart;
+int	tapeposflag;
+#endif /* USE_QFA */
+
 #ifdef	__linux__
 char	*__progname;
 #endif
@@ -150,11 +158,11 @@ main(int argc, char *argv[])
 #ifdef KERBEROS
 		"k"
 #endif
-		"mMN"
+		"lmMN"
 #ifdef USE_QFA
 		"Q:"
 #endif
-		"Rrs:tT:uvxX:y")) != -1)
+		"Rrs:tT:uvVxX:y")) != -1)
 		switch(ch) {
 		case 'b':
 			/* Change default tape blocksize. */
@@ -206,6 +214,9 @@ main(int argc, char *argv[])
 				    ch, command);
 			command = ch;
 			break;
+		case 'l':
+			lflag = 1;
+			break;
 		case 'm':
 			mflag = 0;
 			break;
@@ -235,6 +246,9 @@ main(int argc, char *argv[])
 		case 'v':
 			vflag = 1;
 			break;
+		case 'V':
+			Vflag = 1;
+			break;
 		case 'X':
 			if( !strcmp(optarg,"-") ) {
 				use_stdin("-X");
@@ -269,7 +283,22 @@ main(int argc, char *argv[])
 
 	atexit(cleanup);
 
-	setinput(inputdev);
+	if (command == 'C' && inputdev[0] != '/' && strcmp(inputdev, "-")
+#ifdef RRESTORE
+	    && !strchr(inputdev, ':')
+#endif
+	  ) {
+		/* since we chdir into the directory we are comparing
+		 * to, we must retain the full tape path */
+		char wd[MAXPATHLEN], fullpathinput[MAXPATHLEN];
+		if (!getcwd(wd, MAXPATHLEN))
+			err(1, "can't get current directory");
+		snprintf(fullpathinput, MAXPATHLEN, "%s/%s", wd, inputdev);
+		fullpathinput[MAXPATHLEN - 1] = '\0';
+		setinput(fullpathinput);
+	}
+	else
+		setinput(inputdev);
 
 	if (argc == 0 && !filelist) {
 		argc = 1;
@@ -505,12 +534,12 @@ usage(void)
 
 	(void)fprintf(stderr,
 	  "usage:\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n",
-	  __progname, " -C [-c" kerbflag "Mvy] [-b blocksize] [-D filesystem] [-f file] [-F script] [-s fileno]",
-	  __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno]",
-	  __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
-	  __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
-	  __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]",
-	  __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]");
+	  __progname, " -C [-c" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file] [-F script] [-s fileno]",
+	  __progname, " -i [-ch" kerbflag "lmMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno]",
+	  __progname, " -r [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
+	  __progname, " -R [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
+	  __progname, " -t [-ch" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]",
+	  __progname, " -x [-ch" kerbflag "lmMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]");
 	exit(1);
 }