* 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
*/
/*-
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.11 2000/01/07 19:24:04 tiniou Exp $";
+ "$Id: main.c,v 1.21 2000/03/03 11:43:35 stelian Exp $";
#endif /* not lint */
#include <sys/param.h>
static void obsolete __P((int *, char **[]));
static void usage __P((void));
+ino_t iexclude_list[IEXCLUDE_MAXNUM]; /* the inode exclude list */
+int iexclude_num = 0; /* number of elements in the list */
+
int
main(int argc, char *argv[])
{
ino_t maxino;
#ifdef __linux__
errcode_t retval;
- char directory[NAME_MAX];
- char pathname[NAME_MAX];
+ char directory[MAXPATHLEN];
+ char pathname[MAXPATHLEN];
#endif
time_t tnow;
char labelstr[LBLSIZE];
#endif
tsize = 0; /* Default later, based on 'c' option for cart tapes */
+ eot_script = NULL;
if ((tapeprefix = getenv("TAPE")) == NULL)
tapeprefix = _PATH_DEFTAPE;
dumpdates = _PATH_DUMPDATES;
- temp = _PATH_DTMP;
strcpy(labelstr, "none"); /* XXX safe strcpy. */
if (TP_BSIZE / DEV_BSIZE == 0 || TP_BSIZE % DEV_BSIZE != 0)
quit("TP_BSIZE must be a multiple of DEV_BSIZE\n");
obsolete(&argc, &argv);
#ifdef KERBEROS
-#define optstring "0123456789aB:b:cd:f:h:kL:Mns:ST:uWw"
+#define optstring "0123456789aB:b:cd:e:f:F:h:kL:Mns:ST:uWw"
#else
-#define optstring "0123456789aB:b:cd:f:h:L:Mns:ST:uWw"
+#define optstring "0123456789aB:b:cd:e:f:F:h:L:Mns:ST:uWw"
#endif
while ((ch = getopt(argc, argv, optstring)) != -1)
#undef optstring
if (density >= 625 && !bflag)
ntrec = HIGHDENSITYTREC;
break;
+
+ /* 04-Feb-00 ILC */
+ case 'e': /* exclude an inode */
+ iexclude_list[iexclude_num++] =
+ numarg("inode to exclude",0L,0L);
+ msg("Added %d to exclude list\n",
+ iexclude_list[iexclude_num-1]);
+ break;
case 'f': /* output file */
tapeprefix = optarg;
break;
+ case 'F': /* end of tape script */
+ eot_script = optarg;
+ break;
+
case 'h':
honorlevel = numarg("honor level", 0L, 10L);
break;
exit(X_STARTUP);
}
disk = *argv++;
+ if (strlen(disk) >= MAXPATHLEN) {
+ (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", disk);
+ exit(X_STARTUP);
+ }
argc--;
if (argc >= 1) {
(void)fprintf(stderr, "Unknown arguments to dump:");
signal(SIGINT, SIG_IGN);
set_operators(); /* /etc/group snarfed */
getfstab(); /* /etc/fstab snarfed */
+ /*
+ * disk may end in / and this can confuse
+ * fstabsearch.
+ */
+ if (strlen(disk) > 1 && disk[strlen(disk) - 1] == '/')
+ disk[strlen(disk) - 1] = '\0';
/*
* disk can be either the full special file name,
* the suffix of the special file name,
dt = fstabsearchdir(pathname, directory);
if (dt != NULL) {
char name[MAXPATHLEN];
- (void)sprintf(name, "%s (dir %s)",
- dt->fs_spec, directory);
- (void)strncpy(spcl.c_dev, name, NAMELEN);
- (void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN);
+ (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
+ (void)snprintf(name, sizeof(name), "%s (dir %s)",
+ dt->fs_file, directory);
+ (void)strncpy(spcl.c_filesys, name, NAMELEN);
disk = rawname(dt->fs_spec);
} else {
(void)strncpy(spcl.c_dev, disk, NAMELEN);
}
if (Mflag)
- snprintf(tape, NAME_MAX, "%s%03d", tapeprefix, tapeno + 1);
+ snprintf(tape, MAXPATHLEN, "%s%03d", tapeprefix, tapeno + 1);
else
- strncpy(tape, tapeprefix, NAME_MAX);
- tape[NAME_MAX - 1] = '\0';
+ strncpy(tape, tapeprefix, MAXPATHLEN);
+ tape[MAXPATHLEN - 1] = '\0';
if (!sizest) {
#else
spcl.c_ddate == 0 ? "the epoch\n" : ctime(&spcl.c_ddate));
#endif
- msg("Dumping %s ", disk);
- if (dt != NULL)
- msgtail("(%s) ", dt->fs_file);
+ msg("Dumping %s (%s) ", disk, spcl.c_filesys);
if (host)
msgtail("to %s on host %s\n", tape, host);
else
usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char));
dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
- tapesize = 3 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
+ tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
nonodump = spcl.c_level < honorlevel;
}
if (sizest) {
- printf("%.0f\n", ((double)tapesize + 10) * TP_BSIZE);
+ printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE);
exit(X_FINOK);
} /* stop here for size estimate */
if (pipeout || unlimited) {
- tapesize += 10; /* 10 trailer blocks */
+ tapesize += 11; /* 10 trailer blocks + 1 map header */
msg("estimated %ld tape blocks.\n", tapesize);
} else {
double fetapes;
if ((dp->di_mode & IFMT) != IFDIR)
continue;
#ifdef __linux__
+ /*
+ * Skip directory inodes deleted and not yes reallocated...
+ */
+ if (dp->di_nlink == 0 || dp->di_dtime != 0)
+ continue;
(void)dumpdirino(dp, ino);
#else
(void)dumpino(dp, ino);
msg("dumping (Pass IV) [regular files]\n");
for (map = dumpinomap, ino = 1; ino < maxino; ino++) {
- int mode;
-
if (((ino - 1) % NBBY) == 0) /* map is offset by 1 */
dirty = *map++;
else
* Skip inodes deleted and reallocated as directories.
*/
dp = getino(ino);
- mode = dp->di_mode & IFMT;
- if (mode == IFDIR)
+ if ((dp->di_mode & IFMT) == IFDIR)
continue;
+#ifdef __linux__
+ /*
+ * No need to check here for deleted and not yes reallocated inodes
+ * since this is done in dumpino().
+ */
+#endif
(void)dumpino(dp, ino);
}
spcl.c_type = TS_END;
for (i = 0; i < ntrec; i++)
writeheader(maxino - 1);
+
+ tnow = trewind();
+
if (pipeout)
- msg("DUMP: %ld tape blocks\n", spcl.c_tapea);
+ msg("%ld tape blocks\n", spcl.c_tapea);
else
- msg("DUMP: %ld tape blocks on %d volumes(s)\n",
+ msg("%ld tape blocks on %d volumes(s)\n",
spcl.c_tapea, spcl.c_volume);
/* report dump performance, avoid division through zero */
tend_writing - tstart_writing,
spcl.c_tapea / (tend_writing - tstart_writing));
- tnow = do_stats();
putdumptime();
#ifdef __linux__
- msg("DUMP: Date of this level %c dump: %s", level,
+ msg("Date of this level %c dump: %s", level,
spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
#else
- msg("DUMP: Date of this level %c dump: %s", level,
+ msg("Date of this level %c dump: %s", level,
spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
#endif
- msg("DUMP: Date this dump completed: %s", ctime(&tnow));
+ msg("Date this dump completed: %s", ctime(&tnow));
- msg("DUMP: Average transfer rate: %ld KB/s\n", xferrate / tapeno);
+ msg("Average transfer rate: %ld KB/s\n", xferrate / tapeno);
- trewind();
broadcast("DUMP IS DONE!\7\7\n");
msg("DUMP IS DONE\n");
Exit(X_FINOK);
"k"
#endif
"MnSu] [-B records] [-b blocksize] [-d density]\n"
- "\t%s [-f file] [-h level] [-s feet] [-T date] filesystem\n"
+ "\t%s [-e inode#] [-f file] [-h level] [-s feet] [-T date] filesystem\n"
"\t%s [-W | -w]\n", __progname, white, __progname);
exit(X_STARTUP);
}
case 'B':
case 'b':
case 'd':
+ case 'e':
case 'f':
+ case 'F':
case 'h':
+ case 'L':
case 's':
case 'T':
if (*argv == NULL) {
git.wh0rd.org / dump.git / blobdiff