* 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-2000
+ * Stelian Pop <pop@noos.fr>, 1999-2000
+ * Stelian Pop <pop@noos.fr> - AlcĂ´ve <www.alcove.fr>, 2000
*/
/*-
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.12 2000/01/21 10:17:41 stelian Exp $";
+ "$Id: main.c,v 1.50 2001/07/18 09:12:05 stelian Exp $";
#endif /* not lint */
+#include <config.h>
+#include <compatlfs.h>
+#include <ctype.h>
+#include <compaterr.h>
+#include <fcntl.h>
+#include <fstab.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
#include <sys/param.h>
#include <sys/time.h>
+#include <time.h>
#ifdef __linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
#include <linux/ext2_fs.h>
+#endif
+#include <ext2fs/ext2fs.h>
#include <sys/stat.h>
#include <bsdcompat.h>
-#else
-#ifdef sunos
+#elif defined sunos
#include <sys/vnode.h>
#include <ufs/inode.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
#endif
-#endif
#include <protocols/dumprestore.h>
-#include <ctype.h>
-#include <compaterr.h>
-#include <fcntl.h>
-#include <fstab.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __linux__
-#include <ext2fs/ext2fs.h>
-#endif
-
#include "dump.h"
#include "pathnames.h"
+#include "bylabel.h"
#ifndef SBOFF
#define SBOFF (SBLOCK * DEV_BSIZE)
int density = 0; /* density in bytes/0.1" " <- this is for hilit19 */
int ntrec = NTREC; /* # tape blocks in each tape record */
int cartridge = 0; /* Assume non-cartridge tape */
+#ifdef USE_QFA
+int tapepos = 0; /* assume no QFA tapeposition needed by user */
+#endif /* USE_QFA */
int dokerberos = 0; /* Use Kerberos authentication */
long dev_bsize = 1; /* recalculated below */
long blocksperfile; /* output blocks per file */
char *host = NULL; /* remote host (if any) */
int sizest = 0; /* return size estimate only */
+int compressed = 0; /* use zlib to compress the output, compress level 1-9 */
+long long bytes_written = 0; /* total bytes written */
+long uncomprblks = 0;/* uncompressed blocks written */
#ifdef __linux__
char *__progname;
static void obsolete __P((int *, char **[]));
static void usage __P((void));
+dump_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[])
{
- register ino_t ino;
+ register dump_ino_t ino;
register int dirty;
register struct dinode *dp;
register struct fstab *dt;
register char *map;
register int ch;
int i, anydirskipped, bflag = 0, Tflag = 0, honorlevel = 1;
- ino_t maxino;
+ dump_ino_t maxino;
+ struct STAT statbuf;
+ dev_t filedev = 0;
#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];
+ char *diskparam;
- spcl.c_date = 0;
-#ifdef __linux__
- (void)time4(&spcl.c_date);
-#else
- (void)time((time_t *)&spcl.c_date);
-#endif
+ spcl.c_label[0] = '\0';
+ spcl.c_date = time(NULL);
#ifdef __linux__
__progname = argv[0];
#endif
tsize = 0; /* Default later, based on 'c' option for cart tapes */
+ unlimited = 1;
+ 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");
level = '0';
usage();
obsolete(&argc, &argv);
+
+#ifdef USE_QFA
+ gTapeposfd = -1;
+#endif /* USE_QFA */
+
+ while ((ch = getopt(argc, argv,
+ "0123456789aB:b:cd:e:f:F:h:L:"
#ifdef KERBEROS
-#define optstring "0123456789aB:b:cd:f:h:kL:Mns:ST:uWw"
-#else
-#define optstring "0123456789aB:b:cd:f:h:L:Mns:ST:uWw"
+ "k"
+#endif
+ "Mn"
+#ifdef USE_QFA
+ "Q:"
+#endif
+ "s:ST:uWw"
+#ifdef HAVE_ZLIB
+ "z::"
#endif
- while ((ch = getopt(argc, argv, optstring)) != -1)
-#undef optstring
+ )) != -1)
switch (ch) {
/* dump level */
case '0': case '1': case '2': case '3': case '4':
break;
case 'B': /* blocks per output file */
+ unlimited = 0;
blocksperfile = numarg("number of blocks per file",
1L, 0L);
break;
ntrec = numarg("number of blocks per write",
1L, 1000L);
if (ntrec > maxbsize/1024) {
- msg("Please choose a blocksize <= %dKB\n",
+ msg("Please choose a blocksize <= %dkB\n",
maxbsize/1024);
+ msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
bflag = 1;
break;
case 'c': /* Tape is cart. not 9-track */
+ unlimited = 0;
cartridge = 1;
break;
case 'd': /* density, in bits per inch */
+ unlimited = 0;
density = numarg("density", 10L, 327670L) / 10;
if (density >= 625 && !bflag)
ntrec = HIGHDENSITYTREC;
break;
+
+ /* 04-Feb-00 ILC */
+ case 'e': /* exclude an inode */
+ if (iexclude_num == IEXCLUDE_MAXNUM) {
+ msg("Too many -e options\n");
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
+ iexclude_list[iexclude_num++] = numarg("inode to exclude",0L,0L);
+ if (iexclude_list[iexclude_num-1] <= ROOTINO) {
+ msg("Cannot exclude inode %ld\n", (long)iexclude_list[iexclude_num-1]);
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
+ 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;
* the last must be '\0', so the limit on strlen()
* is really LBLSIZE-1.
*/
- strncpy(labelstr, optarg, LBLSIZE);
- labelstr[LBLSIZE-1] = '\0';
+ strncpy(spcl.c_label, optarg, LBLSIZE);
+ spcl.c_label[LBLSIZE-1] = '\0';
if (strlen(optarg) > LBLSIZE-1) {
msg(
"WARNING Label `%s' is larger than limit of %d characters.\n",
optarg, LBLSIZE-1);
msg("WARNING: Using truncated label `%s'.\n",
- labelstr);
+ spcl.c_label);
}
break;
notify = 1;
break;
+#ifdef USE_QFA
+ case 'Q': /* create tapeposfile */
+ gTapeposfile = optarg;
+ tapepos = 1;
+ break;
+#endif /* USE_QFA */
+
case 's': /* tape size, feet */
+ unlimited = 0;
tsize = numarg("tape size", 1L, 0L) * 12 * 10;
break;
case 'T': /* time of last dump */
spcl.c_ddate = unctime(optarg);
if (spcl.c_ddate < 0) {
- (void)fprintf(stderr, "bad time \"%s\"\n",
- optarg);
+ msg("bad time \"%s\"\n", optarg);
+ msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
Tflag = 1;
case 'w':
lastdump(ch);
exit(X_FINOK); /* do nothing else */
+#ifdef HAVE_ZLIB
+ case 'z':
+ compressed = 2;
+ if (optarg)
+ compressed = numarg("compress level", 1L, 9L);
+ break;
+#endif /* HAVE_ZLIB */
default:
usage();
argv += optind;
if (argc < 1) {
- (void)fprintf(stderr, "Must specify disk or filesystem\n");
+ msg("Must specify disk or filesystem\n");
+ msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
- disk = *argv++;
- argc--;
- if (argc >= 1) {
- (void)fprintf(stderr, "Unknown arguments to dump:");
- while (argc--)
- (void)fprintf(stderr, " %s", *argv++);
- (void)fprintf(stderr, "\n");
+ diskparam = *argv++;
+ if (strlen(diskparam) >= MAXPATHLEN) {
+ msg("Disk or filesystem name too long: %s\n", diskparam);
+ msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
+ argc--;
if (Tflag && uflag) {
- (void)fprintf(stderr,
- "You cannot use the T and u flags together.\n");
+ msg("You cannot use the T and u flags together.\n");
+ msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
if (strcmp(tapeprefix, "-") == 0) {
*tapeprefix++ = '\0';
#ifdef RDUMP
if (index(tapeprefix, '\n')) {
- (void)fprintf(stderr, "invalid characters in tape\n");
- exit(X_STARTUP);
+ msg("invalid characters in tape\n");
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
}
if (rmthost(host) == 0)
exit(X_STARTUP);
#else
- (void)fprintf(stderr, "remote dump not enabled\n");
+ msg("remote dump not enabled\n");
+ msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
#endif
}
signal(SIGINT, SIG_IGN);
set_operators(); /* /etc/group snarfed */
getfstab(); /* /etc/fstab snarfed */
+
+ /*
+ * disk may end in / and this can confuse
+ * fstabsearch.
+ */
+ i = strlen(diskparam) - 1;
+ if (i > 1 && diskparam[i] == '/')
+ diskparam[i] = '\0';
+
+ 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);
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
/*
* disk can be either the full special file name,
* the suffix of the special file name,
* the file system name with or without the leading '/'.
*/
if ((dt = fstabsearch(disk)) != NULL) {
+ /* if found then only one parameter (i.e. partition)
+ * is allowed */
+ if (argc >= 1) {
+ (void)fprintf(stderr, "Unknown arguments to dump:");
+ while (argc--)
+ (void)fprintf(stderr, " %s", *argv++);
+ (void)fprintf(stderr, "\n");
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
disk = rawname(dt->fs_spec);
(void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
(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 __linux__
#ifdef HAVE_REALPATH
if (realpath(disk, pathname) == NULL)
#endif
strcpy(pathname, disk);
- 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);
+ /*
+ * 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
- } else {
(void)strncpy(spcl.c_dev, disk, NAMELEN);
(void)strncpy(spcl.c_filesys, "an unlisted file system",
NAMELEN);
- }
#endif
- spcl.c_dev[NAMELEN-1]='\0';
- spcl.c_filesys[NAMELEN-1]='\0';
- (void)strncpy(spcl.c_label, labelstr, sizeof(spcl.c_label) - 1);
+ }
+
+ if (directory[0] != 0) {
+ if (level != '0') {
+ msg("Only level 0 dumps are allowed on a subdirectory\n");
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
+ if (uflag) {
+ msg("You can't update the dumpdates file when dumping a subdirectory\n");
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
+ }
+ spcl.c_dev[NAMELEN-1] = '\0';
+ spcl.c_filesys[NAMELEN-1] = '\0';
(void)gethostname(spcl.c_host, NAMELEN);
+ spcl.c_host[NAMELEN-1] = '\0';
spcl.c_level = level - '0';
spcl.c_type = TS_TAPE;
if (!Tflag)
}
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) {
msg("Date of this level %c dump: %s", level,
-#ifdef __linux__
- spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
-#else
- spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
-#endif
- msg("Date of last level %c dump: %s", lastlevel,
-#ifdef __linux__
- spcl.c_ddate == 0 ? "the epoch\n" : ctime4(&spcl.c_ddate));
-#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);
+ ctime4(&spcl.c_date));
+ if (spcl.c_ddate)
+ msg("Date of last level %c dump: %s", lastlevel,
+ ctime4(&spcl.c_ddate));
+ msg("Dumping %s (%s) ", disk, spcl.c_filesys);
if (host)
msgtail("to %s on host %s\n", tape, host);
else
msgtail("to %s\n", tape);
- msg("Label: %s\n", labelstr);
-
} /* end of size estimate */
#ifdef __linux__
if (retval) {
com_err(disk, retval, "while opening filesystem");
if (retval == EXT2_ET_REV_TOO_HIGH)
- printf ("Get a newer version of dump!\n");
+ msg("Get a newer version of dump!\n");
+ msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
if (fs->super->s_rev_level > DUMP_CURRENT_REV) {
com_err(disk, retval, "while opening filesystem");
- printf ("Get a newer version of dump!\n");
+ msg("Get a newer version of dump!\n");
+ msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
- if ((diskfd = open(disk, O_RDONLY)) < 0) {
+ if ((diskfd = OPEN(disk, O_RDONLY)) < 0) {
msg("Cannot open %s\n", disk);
+ msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
+ /* if no user label specified, use ext2 filesystem label if available */
+ if (spcl.c_label[0] == '\0') {
+ const char *lbl;
+ if ( (lbl = get_device_label(disk)) != NULL) {
+ strncpy(spcl.c_label, lbl, LBLSIZE);
+ spcl.c_label[LBLSIZE-1] = '\0';
+ }
+ else
+ strcpy(spcl.c_label, "none"); /* safe strcpy. */
+ }
sync();
dev_bsize = DEV_BSIZE;
dev_bshift = ffs(dev_bsize) - 1;
#else /* __linux __*/
if ((diskfd = open(disk, O_RDONLY)) < 0) {
msg("Cannot open %s\n", disk);
+ msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
sync();
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);
+ if (usedinomap == NULL || dumpdirmap == NULL || dumpinomap == NULL)
+ quit("out of memory allocating inode maps\n");
+ tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
nonodump = spcl.c_level < honorlevel;
+ if (!sizest) {
+ msg("Label: %s\n", spcl.c_label);
+
+ if (compressed)
+ msg("Compressing output at compression level %d\n",
+ compressed);
+ }
+
#if defined(SIGINFO)
(void)signal(SIGINFO, statussig);
#endif
#ifdef __linux__
if (directory[0] == 0)
anydirskipped = mapfiles(maxino, &tapesize);
- else
- anydirskipped = mapfilesfromdir(maxino, &tapesize, directory);
+ else {
+ if (STAT(pathname, &statbuf) == -1) {
+ msg("File cannot be accessed (%s).\n", pathname);
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
+ filedev = statbuf.st_dev;
+ if (!(statbuf.st_mode & S_IFDIR)) /* is a file */
+ anydirskipped = maponefile(maxino, &tapesize,
+ directory);
+ else
+ anydirskipped = mapfilesfromdir(maxino, &tapesize,
+ directory);
+ }
+ while (argc--) {
+ int anydirskipped2;
+ char *p = *argv;
+ /* check if file is available */
+ if (STAT(p, &statbuf) == -1) {
+ msg("File cannot be accessed (%s).\n", p);
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
+ /* check if file is on same unix partiton as the first
+ * argument */
+ if (statbuf.st_dev != filedev) {
+ msg("Files are not on same file system (%s).\n", p);
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
+ /* check if file is a directory */
+ if (!(statbuf.st_mode & S_IFDIR))
+ anydirskipped2 = maponefile(maxino, &tapesize,
+ p+strlen(dt->fs_file));
+ else
+ /* read directory inodes.
+ * NOTE: nested directories are not recognized
+ * so inodes may be umped twice!
+ */
+ anydirskipped2 = mapfilesfromdir(maxino, &tapesize,
+ p+strlen(dt->fs_file));
+ if (!anydirskipped)
+ anydirskipped = anydirskipped2;
+ argv++;
+ }
#else
anydirskipped = mapfiles(maxino, &tapesize);
#endif
}
if (sizest) {
- printf("%.0f\n", ((double)tapesize + 10) * TP_BSIZE);
+ printf("%.0f\n", ((double)tapesize + 1 + ntrec) * TP_BSIZE);
exit(X_FINOK);
} /* stop here for size estimate */
if (pipeout || unlimited) {
- tapesize += 10; /* 10 trailer blocks */
+ tapesize += 1 + ntrec; /* 1 map header + trailer blocks */
msg("estimated %ld tape blocks.\n", tapesize);
} else {
double fetapes;
/* count the dumped inodes map on each additional tape */
tapesize += (etapes - 1) *
(howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
- tapesize += etapes + 10; /* headers + 10 trailer blks */
+ tapesize += etapes + ntrec; /* headers + trailer blks */
msg("estimated %ld tape blocks on %3.2f tape(s).\n",
tapesize, fetapes);
}
+#ifdef USE_QFA
+ if (tapepos) {
+ msg("writing QFA positions to %s\n", gTapeposfile);
+ if ((gTapeposfd = open(gTapeposfile, O_RDWR|O_CREAT)) < 0)
+ quit("can't open tapeposfile\n");
+ /* print QFA-file header */
+ sprintf(gTps, "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION, (unsigned long)spcl.c_date);
+ if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+ quit("can't write tapeposfile\n");
+ sprintf(gTps, "ino\ttapeno\ttapepos\n");
+ if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+ quit("can't write tapeposfile\n");
+ }
+#endif /* USE_QFA */
+
/*
* Allocate tape buffer.
*/
"can't allocate tape buffers - try a smaller blocking factor.\n");
startnewtape(1);
-#ifdef __linux__
- (void)time4(&(tstart_writing));
-#else
- (void)time((time_t *)&(tstart_writing));
-#endif
+ tstart_writing = time(NULL);
dumpmap(usedinomap, TS_CLRI, maxino - 1);
msg("dumping (Pass III) [directories]\n");
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 yet reallocated
+ * inodes since this is done in dumpino().
+ */
+#endif
(void)dumpino(dp, ino);
}
-#ifdef __linux__
- (void)time4(&(tend_writing));
-#else
- (void)time((time_t *)&(tend_writing));
-#endif
+ tend_writing = time(NULL);
spcl.c_type = TS_END;
- for (i = 0; i < ntrec; i++)
+ /*
+ * Finish off the current tape record with trailer blocks, to ensure
+ * at least the data in the last partial record makes it to tape.
+ * Also make sure we write at least 1 trailer block.
+ */
+ for (i = ntrec - (spcl.c_tapea % ntrec); i; --i)
writeheader(maxino - 1);
+
+ 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 */
+ /* report dump performance, avoid division by zero */
if (tend_writing - tstart_writing == 0)
msg("finished in less than a second\n");
else
- msg("finished in %d seconds, throughput %d KBytes/sec\n",
+ msg("finished in %d seconds, throughput %d kBytes/sec\n",
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,
- spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
-#endif
- msg("DUMP: Date this dump completed: %s", ctime(&tnow));
-
- msg("DUMP: Average transfer rate: %ld KB/s\n", xferrate / tapeno);
+ msg("Date this dump completed: %s", ctime(&tnow));
+
+ msg("Average transfer rate: %ld kB/s\n", xferrate / tapeno);
+ if (compressed) {
+ long tapekb = bytes_written / 1024;
+ double rate = .0005 + (double) spcl.c_tapea / tapekb;
+ msg("Wrote %ldkB uncompressed, %ldkB compressed, %1.3f:1\n",
+ spcl.c_tapea, tapekb, rate);
+ }
- trewind();
broadcast("DUMP IS DONE!\7\7\n");
msg("DUMP IS DONE\n");
Exit(X_FINOK);
usage(void)
{
char white[MAXPATHLEN];
- int i;
-
- strncpy(white, __progname, MAXPATHLEN-1);
- white[MAXPATHLEN-1] = '\0';
- for (i=0; i<MAXPATHLEN; ++i)
- if (white[i] != '\0') white[i] = ' ';
+ const char *ext2ver, *ext2date;
- fprintf(stderr,
- "%s %s\n", __progname, _DUMP_VERSION);
+ memset(white, ' ', MAXPATHLEN);
+ white[MIN(strlen(__progname), MAXPATHLEN - 1)] = '\0';
+
+#ifdef __linux__
+ ext2fs_get_library_version(&ext2ver, &ext2date);
+ fprintf(stderr, "%s %s (using libext2fs %s of %s)\n",
+ __progname, _DUMP_VERSION, ext2ver, ext2date);
+#else
+ fprintf(stderr, "%s %s\n", __progname, _DUMP_VERSION);
+#endif
fprintf(stderr,
"usage:\t%s [-0123456789ac"
#ifdef KERBEROS
"k"
#endif
- "MnSu] [-B records] [-b blocksize] [-d density]\n"
- "\t%s [-f file] [-h level] [-s feet] [-T date] filesystem\n"
- "\t%s [-W | -w]\n", __progname, white, __progname);
+ "MnSu"
+ "] [-B records] [-b blocksize] [-d density]\n"
+ "\t%s [-e inode#] [-f file] [-h level] "
+#ifdef USE_QFA
+ "[-Q file] "
+#endif
+ "[-s feet]\n"
+ "\t%s [-T date] "
+#ifdef HAVE_ZLIB
+ "[-z zlevel] "
+#endif
+ "filesystem\n"
+ "\t%s [-W | -w]\n",
+ __progname, white, white, __progname);
exit(X_STARTUP);
}
case SIGTRAP:
if (pipeout)
quit("Signal on pipe: cannot recover\n");
- msg("Rewriting attempted as response to unknown signal.\n");
+ msg("Rewriting attempted as response to unknown signal: %d.\n", signo);
(void)fflush(stderr);
(void)fflush(stdout);
close_rewind();
}
}
-char *
-rawname(char *cp)
+const char *
+rawname(const char *cp)
{
#ifdef __linux__
return cp;
if (dp == NULL)
return (NULL);
- *dp = '\0';
- (void)strncpy(rawbuf, cp, MAXPATHLEN - 1);
- rawbuf[MAXPATHLEN-1] = '\0';
- *dp = '/';
+ (void)strncpy(rawbuf, cp, min(dp-cp, MAXPATHLEN - 1));
+ rawbuf[min(dp-cp, MAXPATHLEN-1)] = '\0';
(void)strncat(rawbuf, "/r", MAXPATHLEN - 1 - strlen(rawbuf));
(void)strncat(rawbuf, dp + 1, MAXPATHLEN - 1 - strlen(rawbuf));
return (rawbuf);
case 'B':
case 'b':
case 'd':
+ case 'e':
case 'f':
+ case 'F':
case 'h':
+ case 'L':
+ case 'Q':
case 's':
case 'T':
if (*argv == NULL) {