#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.18 2000/03/02 11:34:51 stelian Exp $";
+ "$Id: main.c,v 1.26 2000/09/26 12:34:52 stelian Exp $";
#endif /* not lint */
#include <sys/param.h>
#include "dump.h"
#include "pathnames.h"
+#include "bylabel.h"
#ifndef SBOFF
#define SBOFF (SBLOCK * DEV_BSIZE)
#endif
time_t tnow;
char labelstr[LBLSIZE];
+ char *diskparam;
spcl.c_date = 0;
#ifdef __linux__
/* 04-Feb-00 ILC */
case 'e': /* exclude an inode */
- iexclude_list[iexclude_num++] =
- numarg("inode to exclude",0L,0L);
+ if (iexclude_num == IEXCLUDE_MAXNUM) {
+ (void)fprintf(stderr, "Too many -e options\n");
+ exit(X_STARTUP);
+ }
+ iexclude_list[iexclude_num++] = numarg("inode to exclude",0L,0L);
+ if (iexclude_list[iexclude_num-1] <= ROOTINO) {
+ (void)fprintf(stderr, "Cannot exclude inode %ld\n", iexclude_list[iexclude_num-1]);
+ exit(X_STARTUP);
+ }
msg("Added %d to exclude list\n",
iexclude_list[iexclude_num-1]);
break;
(void)fprintf(stderr, "Must specify disk or filesystem\n");
exit(X_STARTUP);
}
- disk = *argv++;
- if (strlen(disk) > MAXPATHLEN) {
- (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", disk);
+ diskparam = *argv++;
+ if (strlen(diskparam) >= MAXPATHLEN) {
+ (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", diskparam);
exit(X_STARTUP);
}
argc--;
signal(SIGINT, SIG_IGN);
set_operators(); /* /etc/group snarfed */
getfstab(); /* /etc/fstab snarfed */
+
+ disk = get_device_name(diskparam);
+ if (!disk) { /* null means the disk is some form
+ of LABEL= or UID= but it was not
+ found */
+ msg("Cannot find a disk having %s\n", diskparam);
+ exit(X_STARTUP);
+ }
/*
* disk may end in / and this can confuse
* fstabsearch.
(void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN);
#ifdef __linux__
} else {
- /*
- * The argument was not found in the fstab
- * assume that this is a subtree and search for it
- */
#ifdef HAVE_REALPATH
if (realpath(disk, pathname) == NULL)
#endif
strcpy(pathname, disk);
- 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_file, directory);
- (void)strncpy(spcl.c_filesys, name, NAMELEN);
+ /*
+ * The argument could be now a mountpoint of
+ * a filesystem specified in fstab. Search for it.
+ */
+ if ((dt = fstabsearch(pathname)) != NULL) {
disk = rawname(dt->fs_spec);
+ (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
+ (void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN);
} else {
- (void)strncpy(spcl.c_dev, disk, NAMELEN);
- (void)strncpy(spcl.c_filesys, "an unlisted file system",
- NAMELEN);
+ /*
+ * The argument was not found in the fstab
+ * assume that this is a subtree and search for it
+ */
+ dt = fstabsearchdir(pathname, directory);
+ if (dt != NULL) {
+ char name[MAXPATHLEN];
+ (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);
+ (void)strncpy(spcl.c_filesys, "an unlisted file system",
+ NAMELEN);
+ }
}
}
#else
NAMELEN);
}
#endif
+
+ if (directory[0] != 0) {
+ if (level != '0') {
+ (void)fprintf(stderr, "Only level 0 dumps are allowed on a subdirectory\n");
+ exit(X_STARTUP);
+ }
+ if (uflag) {
+ (void)fprintf(stderr, "You can't update the dumpdates file when dumping a subdirectory\n");
+ exit(X_STARTUP);
+ }
+ }
spcl.c_dev[NAMELEN-1]='\0';
spcl.c_filesys[NAMELEN-1]='\0';
(void)strncpy(spcl.c_label, labelstr, sizeof(spcl.c_label) - 1);
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;
tnow = trewind();
if (pipeout)
- msg("DUMP: %ld tape blocks\n", spcl.c_tapea);
+ msg("%ld tape blocks (%.2fMB)\n", spcl.c_tapea,
+ ((double)spcl.c_tapea * TP_BSIZE / 1048576));
else
- msg("DUMP: %ld tape blocks on %d volumes(s)\n",
- spcl.c_tapea, spcl.c_volume);
+ msg("%ld tape blocks (%.2fMB) on %d volume(s)\n",
+ spcl.c_tapea,
+ ((double)spcl.c_tapea * TP_BSIZE / 1048576),
+ spcl.c_volume);
/* report dump performance, avoid division through zero */
if (tend_writing - tstart_writing == 0)
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);
broadcast("DUMP IS DONE!\7\7\n");
msg("DUMP IS DONE\n");
git.wh0rd.org / dump.git / blobdiff