projects
/
debian
/
dump
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian patch 0.4b41-1
[debian/dump]
/
restore
/
main.c
diff --git
a/restore/main.c
b/restore/main.c
index f53d740513c1718b9c156bde174737c15e1edc7a..496391d759f612660c3568407edb78a5e3f3f723 100644
(file)
--- a/
restore/main.c
+++ b/
restore/main.c
@@
-37,7
+37,7
@@
#ifndef lint
static const char rcsid[] =
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.
46 2004/04/13 13:04:33
stelian Exp $";
+ "$Id: main.c,v 1.
50 2005/07/07 09:16:08
stelian Exp $";
#endif /* not lint */
#include <config.h>
#endif /* not lint */
#include <config.h>
@@
-112,6
+112,8
@@
char filesys[NAMELEN];
static const char *stdin_opt = NULL;
char *bot_script = NULL;
dump_ino_t volinfo[TP_NINOS];
static const char *stdin_opt = NULL;
char *bot_script = NULL;
dump_ino_t volinfo[TP_NINOS];
+int wdfd;
+int dirhash_size = 1;
#ifdef USE_QFA
FILE *gTapeposfp;
#ifdef USE_QFA
FILE *gTapeposfp;
@@
-176,7
+178,7
@@
main(int argc, char *argv[])
;
obsolete(&argc, &argv);
while ((ch = getopt(argc, argv,
;
obsolete(&argc, &argv);
while ((ch = getopt(argc, argv,
- "aA:b:CcdD:f:F:hi"
+ "aA:b:CcdD:f:F:h
H:
i"
#ifdef KERBEROS
"k"
#endif
#ifdef KERBEROS
"k"
#endif
@@
-226,6
+228,13
@@
main(int argc, char *argv[])
case 'h':
hflag = 0;
break;
case 'h':
hflag = 0;
break;
+ case 'H':
+ dirhash_size = strtol(optarg, &p, 10);
+ if (*p)
+ errx(1, "illegal hash size -- %s", optarg);
+ if (dirhash_size < 1)
+ errx(1, "hash size must be greater than 0");
+ break;
#ifdef KERBEROS
case 'k':
dokerberos = 1;
#ifdef KERBEROS
case 'k':
dokerberos = 1;
@@
-356,6
+365,10
@@
main(int argc, char *argv[])
else
setinput(inputdev);
else
setinput(inputdev);
+ wdfd = open(".", O_RDONLY);
+ if (wdfd < 0)
+ err(1, "can't get current directory");
+
if (argc == 0 && !filelist) {
argc = 1;
*--argv = ".";
if (argc == 0 && !filelist) {
argc = 1;
*--argv = ".";
@@
-419,6
+432,7
@@
main(int argc, char *argv[])
Vprintf(stdout, "Begin compare restore\n");
compare_ignore_not_found = 0;
compare_errors = 0;
Vprintf(stdout, "Begin compare restore\n");
compare_ignore_not_found = 0;
compare_errors = 0;
+ Nflag = 1;
setup();
printf("filesys = %s\n", filesys);
if (STAT(filesys, &stbuf) < 0)
setup();
printf("filesys = %s\n", filesys);
if (STAT(filesys, &stbuf) < 0)
@@
-427,9
+441,10
@@
main(int argc, char *argv[])
err(1, "cannot cd to %s", filesys);
compare_ignore_not_found = dumptime > 0;
initsymtable((char *)0);
err(1, "cannot cd to %s", filesys);
compare_ignore_not_found = dumptime > 0;
initsymtable((char *)0);
- extractdirs(
0
);
+ extractdirs(
1
);
treescan(".", ROOTINO, nodeupdates);
compareleaves();
treescan(".", ROOTINO, nodeupdates);
compareleaves();
+ comparedirmodes();
checkrestore();
if (compare_errors) {
printf("Some files were modified!\n");
checkrestore();
if (compare_errors) {
printf("Some files were modified!\n");
@@
-672,21
+687,21
@@
usage(void)
fprintf(stderr,
"usage:"
fprintf(stderr,
"usage:"
- "\t%s -C [-cd" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file]\n"
+ "\t%s -C [-cd
H
" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file]\n"
"\t%s [-F script] [-L limit] [-s fileno]\n"
"\t%s [-F script] [-L limit] [-s fileno]\n"
- "\t%s -i [-acdh" kerbflag "lmMouvVy] [-A file] [-b blocksize] [-f file]\n"
+ "\t%s -i [-acdh
H
" kerbflag "lmMouvVy] [-A file] [-b blocksize] [-f file]\n"
"\t%s [-F script] " qfaflag "[-s fileno]\n"
#ifdef USE_QFA
"\t%s [-F script] " qfaflag "[-s fileno]\n"
#ifdef USE_QFA
- "\t%s -P file [-acdh" kerbflag "lmMuvVy] [-A file] [-b blocksize]\n"
+ "\t%s -P file [-acdh
H
" kerbflag "lmMuvVy] [-A file] [-b blocksize]\n"
"\t%s [-f file] [-F script] [-s fileno] [-X filelist] [file ...]\n"
#endif
"\t%s [-f file] [-F script] [-s fileno] [-X filelist] [file ...]\n"
#endif
- "\t%s -r [-cd" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
+ "\t%s -r [-cd
H
" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
"\t%s [-s fileno] [-T directory]\n"
"\t%s [-s fileno] [-T directory]\n"
- "\t%s -R [-cd" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
+ "\t%s -R [-cd
H
" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
"\t%s [-s fileno] [-T directory]\n"
"\t%s [-s fileno] [-T directory]\n"
- "\t%s -t [-cdh" kerbflag "lMuvVy] [-A file] [-b blocksize] [-f file]\n"
+ "\t%s -t [-cdh
H
" kerbflag "lMuvVy] [-A file] [-b blocksize] [-f file]\n"
"\t%s [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n"
"\t%s [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n"
- "\t%s -x [-acdh" kerbflag "lmMouvVy] [-A file] [-b blocksize] [-f file]\n"
+ "\t%s -x [-acdh
H
" kerbflag "lmMouvVy] [-A file] [-b blocksize] [-f file]\n"
"\t%s [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n",
__progname, white,
__progname, white,
"\t%s [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n",
__progname, white,
__progname, white,
@@
-735,6
+750,7
@@
obsolete(int *argcp, char **argvp[])
case 'D':
case 'f':
case 'F':
case 'D':
case 'f':
case 'F':
+ case 'H':
case 'L':
case 'Q':
case 's':
case 'L':
case 'Q':
case 's':