X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Fmain.c;h=36ee2a4eb85123e068b90c11421f5901c2105e32;hb=d339304329df2d458e54c02eac10a27cb31d9cb1;hp=7460d7dd3903075bcff685e49565a4f9e7e0c739;hpb=8d4197bb9ba5bbcef21409231ed8903b0cac353a;p=dump.git

diff --git a/restore/main.c b/restore/main.c
index 7460d7d..36ee2a4 100644
--- a/restore/main.c
+++ b/restore/main.c
@@ -2,8 +2,7 @@
  *	Ported to Linux's Second Extended File System as part of the
  *	dump and restore backup suit
  *	Remy Card <card@Linux.EU.Org>, 1994-1997
- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *	Stelian Pop <pop@cybercable.fr>, 1999-2000
  */
 
 /*
@@ -40,17 +39,8 @@
  */
 
 #ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
-#endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.4 1999/10/11 13:08:09 stelian Exp $";
+	"$Id: main.c,v 1.8 2000/01/21 10:17:41 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -135,9 +125,9 @@ main(int argc, char *argv[])
 		;                                                               
 	obsolete(&argc, &argv);
 #ifdef KERBEROS
-#define	optlist "b:CcdD:f:hikmNRrs:tT:uvxy"
+#define	optlist "b:CcdD:f:hikmMNRrs:tT:uvxy"
 #else
-#define	optlist "b:CcdD:f:himNRrs:tT:uvxy"
+#define	optlist "b:CcdD:f:himMNRrs:tT:uvxy"
 #endif
 	while ((ch = getopt(argc, argv, optlist)) != -1)
 		switch(ch) {
@@ -188,6 +178,9 @@ main(int argc, char *argv[])
 		case 'm':
 			mflag = 0;
 			break;
+		case 'M':
+			Mflag = 1;
+			break;
 		case 'N':
 			Nflag = 1;
 			break;
@@ -366,12 +359,15 @@ usage(void)
 #else
 #define kerbflag
 #endif
-	(void)fprintf(stderr, "usage:\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n",
-	  "restore -i [-ch" kerbflag "muvy] [-b blocksize] [-f file] [-s fileno]",
-	  "restore -r [-c" kerbflag "uvy] [-b blocksize] [-f file] [-s fileno]",
-	  "restore -R [-c" kerbflag "uvy] [-b blocksize] [-f file] [-s fileno]",
-	  "restore -x [-ch" kerbflag "muvy] [-b blocksize] [-f file] [-s fileno] [file ...]",
-	  "restore -t [-ch" kerbflag "kuvy] [-b blocksize] [-f file] [-s fileno] [file ...]");
+	(void)fprintf(stderr, 
+	  "%s %s\n", __progname, _DUMP_VERSION);
+	(void)fprintf(stderr,
+	  "usage:\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n",
+	  __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno]",
+	  __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno]",
+	  __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno]",
+	  __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno] [file ...]",
+	  __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [file ...]");
 	exit(1);
 }