* 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@noos.fr>, 1999-2000
+ * Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
*/
/*
*/
#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.3 1999/10/11 12:59:20 stelian Exp $";
+ "$Id: main.c,v 1.19 2001/03/23 14:40:12 stelian Exp $";
#endif /* not lint */
+#include <config.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
#ifdef __linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
#include <linux/ext2_fs.h>
+#endif
#include <bsdcompat.h>
#include <signal.h>
#include <string.h>
#include "extern.h"
int bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
-int hflag = 1, mflag = 1, Nflag = 0;
+int hflag = 1, mflag = 1, Nflag = 0, zflag = 0;
int uflag = 0;
int dokerberos = 0;
char command = '\0';
long ntrec;
char *dumpmap;
char *usedinomap;
-ino_t maxino;
+dump_ino_t maxino;
time_t dumptime;
time_t dumpdate;
FILE *terminal;
char *tmpdir;
int compare_ignore_not_found;
-char *filesys = NULL;
+int compare_errors;
+char filesys[NAMELEN];
+static const char *stdin_opt = NULL;
#ifdef __linux__
char *__progname;
static void obsolete __P((int *, char **[]));
static void usage __P((void));
+static void use_stdin __P((const char *));
int
main(int argc, char *argv[])
{
int ch;
- ino_t ino;
+ dump_ino_t ino;
char *inputdev = _PATH_DEFTAPE;
char *symtbl = "./restoresymtable";
char *p, name[MAXPATHLEN];
+ FILE *filelist = NULL;
+ char fname[MAXPATHLEN];
/* Temp files should *not* be readable. We set permissions later. */
(void) umask(077);
-
+ filesys[0] = '\0';
#ifdef __linux__
__progname = argv[0];
#endif
;
obsolete(&argc, &argv);
#ifdef KERBEROS
-#define optlist "b:CcdD:f:hikmNRrs:tT:uvxy"
+#define optlist "b:CcdD:f:hikmMNRrs:tT:uvxX:y"
#else
-#define optlist "b:CcdD:f:himNRrs:tT:uvxy"
+#define optlist "b:CcdD:f:himMNRrs:tT:uvxX:y"
#endif
while ((ch = getopt(argc, argv, optlist)) != -1)
switch(ch) {
cvtflag = 1;
break;
case 'D':
- filesys = optarg;
+ strncpy(filesys, optarg, NAMELEN);
+ filesys[NAMELEN - 1] = '\0';
break;
case 'T':
tmpdir = optarg;
dflag = 1;
break;
case 'f':
+ if( !strcmp(optarg,"-") )
+ use_stdin("-f");
inputdev = optarg;
break;
case 'h':
case 'm':
mflag = 0;
break;
+ case 'M':
+ Mflag = 1;
+ break;
case 'N':
Nflag = 1;
break;
case 'v':
vflag = 1;
break;
+ case 'X':
+ if( !strcmp(optarg,"-") ) {
+ use_stdin("-X");
+ filelist = stdin;
+ }
+ else
+ if ( !(filelist = fopen(optarg,"r")) )
+ errx(1, "can't open file for reading -- %s", optarg);
+ break;
case 'y':
yflag = 1;
break;
setinput(inputdev);
- if (argc == 0) {
+ if (argc == 0 && !filelist) {
argc = 1;
*--argv = ".";
}
Vprintf(stdout, "Begin compare restore\n");
compare_ignore_not_found = 0;
+ compare_errors = 0;
setup();
printf("filesys = %s\n", filesys);
if (stat(filesys, &stbuf) < 0)
treescan(".", ROOTINO, nodeupdates);
compareleaves();
checkrestore();
+ if (compare_errors) {
+ printf("Some files were modified!\n");
+ exit(2);
+ }
break;
}
checkrestore();
dumpsymtable(symtbl, (long)1);
break;
+
+/* handle file names from either text file (-X) or the command line */
+#define NEXTFILE(p) \
+ p = NULL; \
+ if (argc) { \
+ --argc; \
+ p = *argv++; \
+ } \
+ else if (filelist) { \
+ if ((p = fgets(fname, MAXPATHLEN, filelist))) { \
+ if ( *p && *(p + strlen(p) - 1) == '\n' ) /* possible null string */ \
+ *(p + strlen(p) - 1) = '\0'; \
+ if ( !*p ) /* skip empty lines */ \
+ continue; \
+ } \
+ }
+
/*
* List contents of tape.
*/
setup();
extractdirs(0);
initsymtable((char *)0);
- while (argc--) {
- canon(*argv++, name, sizeof(name));
+ for (;;) {
+ NEXTFILE(p);
+ if (!p)
+ break;
+ canon(p, name, sizeof(name));
ino = dirlookup(name);
if (ino == 0)
continue;
setup();
extractdirs(1);
initsymtable((char *)0);
- while (argc--) {
- canon(*argv++, name, sizeof(name));
+ for (;;) {
+ NEXTFILE(p);
+ if (!p)
+ break;
+ canon(p, name, sizeof(name));
ino = dirlookup(name);
if (ino == 0)
continue;
static void
usage(void)
{
- (void)fprintf(stderr, "usage:\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n",
- "restore -i [-chkmuvy] [-b blocksize] [-f file] [-s fileno]",
- "restore -r [-ckuvy] [-b blocksize] [-f file] [-s fileno]",
- "restore -R [-ckuvy] [-b blocksize] [-f file] [-s fileno]",
- "restore -x [-chkmuvy] [-b blocksize] [-f file] [-s fileno] [file ...]",
- "restore -t [-chkuvy] [-b blocksize] [-f file] [-s fileno] [file ...]");
+#ifdef __linux__
+ const char *ext2ver, *ext2date;
+
+ ext2fs_get_library_version(&ext2ver, &ext2date);
+ (void)fprintf(stderr, "%s %s (using libext2fs %s of %s)\n",
+ __progname, _DUMP_VERSION, ext2ver, ext2date);
+#else
+ (void)fprintf(stderr, "%s %s\n", __progname, _DUMP_VERSION);
+#endif
+
+#ifdef KERBEROS
+#define kerbflag "k"
+#else
+#define kerbflag
+#endif
+ (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] [-s fileno]",
+ __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno]",
+ __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-T directory]",
+ __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-T directory]",
+ __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]",
+ __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]");
exit(1);
}
for (flags = 0; *ap; ++ap) {
switch (*ap) {
case 'b':
+ case 'D':
case 'f':
case 's':
+ case 'T':
+ case 'X':
if (*argv == NULL) {
warnx("option requires an argument -- %c", *ap);
usage();
/* Update argument count. */
*argcp = nargv - *argvp - 1;
}
+
+/*
+ * use_stdin --
+ * reserve stdin for opt (avoid conflicts)
+ */
+void
+use_stdin(const char *opt)
+{
+ if (stdin_opt)
+ errx(1, "can't handle standard input for both %s and %s",
+ stdin_opt, opt);
+ stdin_opt = opt;
+}
git.wh0rd.org / dump.git / blobdiff