#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.13 2000/01/25 14:14:12 stelian Exp $";
+ "$Id: main.c,v 1.17 2000/03/01 10:16:05 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];
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:h:kL:Mns:ST:uWw"
#else
-#define optstring "0123456789aB:b:cd:f:h:L:Mns:ST:uWw"
+#define optstring "0123456789aB:b:cd:e: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;
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)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
(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);
+ 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
"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);
}