X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Fmain.c;h=4757dc976236913c1dbefd0df4e63031b5efa802;hp=3feca826338866a97364a94d7555baa6538e1624;hb=05f23c0c51be02f2bb0a3706247027dc8fa17af1;hpb=e46507f206f7adcb8d2e218963d2115236e86604

diff --git a/restore/main.c b/restore/main.c
index 3feca82..4757dc9 100644
--- a/restore/main.c
+++ b/restore/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.28 2001/08/14 13:11:58 stelian Exp $";
+	"$Id: main.c,v 1.33 2002/01/11 08:54:14 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, Mflag = 0, 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, Lflag = 0;
 int	dokerberos = 0;
 char	command = '\0';
 long	dumpnum = 1;
@@ -158,11 +158,11 @@ main(int argc, char *argv[])
 #ifdef KERBEROS
 		"k"
 #endif
-		"mMN"
+		"lL:mMN"
 #ifdef USE_QFA
 		"Q:"
 #endif
-		"Rrs:tT:uvxX:y")) != -1)
+		"Rrs:tT:uvVxX:y")) != -1)
 		switch(ch) {
 		case 'b':
 			/* Change default tape blocksize. */
@@ -214,6 +214,16 @@ main(int argc, char *argv[])
 				    ch, command);
 			command = ch;
 			break;
+		case 'l':
+			lflag = 1;
+			break;
+		case 'L':
+			Lflag = strtol(optarg, &p, 10);
+			if (*p)
+				errx(1, "illegal limit -- %s", optarg);
+			if (Lflag < 0)
+				errx(1, "limit must be greater than 0");
+			break;
 		case 'm':
 			mflag = 0;
 			break;
@@ -243,6 +253,9 @@ main(int argc, char *argv[])
 		case 'v':
 			vflag = 1;
 			break;
+		case 'V':
+			Vflag = 1;
+			break;
 		case 'X':
 			if( !strcmp(optarg,"-") ) {
 				use_stdin("-X");
@@ -277,7 +290,11 @@ main(int argc, char *argv[])
 
 	atexit(cleanup);
 
-	if (command == 'C' && inputdev[0] != '/') {
+	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];
@@ -285,7 +302,6 @@ main(int argc, char *argv[])
 			err(1, "can't get current directory");
 		snprintf(fullpathinput, MAXPATHLEN, "%s/%s", wd, inputdev);
 		fullpathinput[MAXPATHLEN - 1] = '\0';
-printf("FULLPATH is %s\n", fullpathinput);
 		setinput(fullpathinput);
 	}
 	else
@@ -525,12 +541,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] [-L limit] [-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);
 }
 
@@ -568,6 +584,7 @@ obsolete(int *argcp, char **argvp[])
 		case 'D':
 		case 'f':
 		case 'F':
+		case 'L':
 		case 'Q':
 		case 's':
 		case 'T':