* 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@noos.fr>, 1999-2000
+ * Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
*/
/*-
*/
#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95";
-#endif
static const char rcsid[] =
- "$Id: main.c,v 1.4 1999/10/11 13:08:07 stelian Exp $";
+ "$Id: main.c,v 1.35 2001/03/19 13:22:48 stelian Exp $";
#endif /* not lint */
+#include <config.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>
#ifdef __linux__
#include <linux/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
+#include <time.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)
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 */
+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));
+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];
+ char *diskparam;
+ spcl.c_label[0] = '\0';
spcl.c_date = 0;
#ifdef __linux__
(void)time4(&spcl.c_date);
#endif
tsize = 0; /* Default later, based on 'c' option for cart tapes */
- if ((tape = getenv("TAPE")) == NULL)
- tape = _PATH_DEFTAPE;
+ 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);
+
+ while ((ch = getopt(argc, argv,
+ "0123456789aB:b:cd:e:f:F:h:L:"
#ifdef KERBEROS
-#define optstring "0123456789aB:b:cd:f:h:kL:ns:T:uWw"
-#else
-#define optstring "0123456789aB:b:cd:f:h:L:ns:T:uWw"
+ "k"
+#endif
+ "Mns:ST:uWw"
+#ifdef HAVE_ZLIB
+ "z"
#endif
- while ((ch = getopt(argc, argv, optstring)) != -1)
+ )) != -1)
#undef optstring
switch (ch) {
/* dump level */
break;
case 'B': /* blocks per output file */
+ unlimited = 0;
blocksperfile = numarg("number of blocks per file",
1L, 0L);
break;
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) {
+ (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", (long)iexclude_list[iexclude_num-1]);
+ exit(X_STARTUP);
+ }
+ msg("Added %d to exclude list\n",
+ iexclude_list[iexclude_num-1]);
+ break;
case 'f': /* output file */
- tape = optarg;
+ tapeprefix = optarg;
+ break;
+
+ case 'F': /* end of tape script */
+ eot_script = optarg;
break;
case 'h':
* 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;
+ case 'M': /* multi-volume flag */
+ Mflag = 1;
+ break;
+
case 'n': /* notify operators */
notify = 1;
break;
case 's': /* tape size, feet */
+ unlimited = 0;
tsize = numarg("tape size", 1L, 0L) * 12 * 10;
break;
+ case 'S':
+ sizest = 1; /* return size estimate only */
+ break;
+
case 'T': /* time of last dump */
spcl.c_ddate = unctime(optarg);
if (spcl.c_ddate < 0) {
case 'w':
lastdump(ch);
exit(X_FINOK); /* do nothing else */
+#ifdef HAVE_ZLIB
+ case 'z':
+ compressed = 1;
+ break;
+#endif /* HAVE_ZLIB */
default:
usage();
(void)fprintf(stderr, "Must specify disk or filesystem\n");
exit(X_STARTUP);
}
- disk = *argv++;
+ diskparam = *argv++;
+ if (strlen(diskparam) >= MAXPATHLEN) {
+ (void)fprintf(stderr, "Disk or filesystem name too long: %s\n",
+ diskparam);
+ exit(X_STARTUP);
+ }
argc--;
if (argc >= 1) {
(void)fprintf(stderr, "Unknown arguments to dump:");
"You cannot use the T and u flags together.\n");
exit(X_STARTUP);
}
- if (strcmp(tape, "-") == 0) {
+ if (strcmp(tapeprefix, "-") == 0) {
pipeout++;
- tape = "standard output";
+ tapeprefix = "standard output";
}
if (blocksperfile)
tsize = cartridge ? 1700L*120L : 2300L*120L;
}
- if (strchr(tape, ':')) {
- host = tape;
- tape = strchr(host, ':');
- *tape++ = '\0';
+ if (strchr(tapeprefix, ':')) {
+ host = tapeprefix;
+ tapeprefix = strchr(host, ':');
+ *tapeprefix++ = '\0';
#ifdef RDUMP
- if (index(tape, '\n')) {
+ if (index(tapeprefix, '\n')) {
(void)fprintf(stderr, "invalid characters in tape\n");
exit(X_STARTUP);
}
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);
+ exit(X_STARTUP);
+ }
/*
* disk can be either the full special file name,
* the suffix of the special file name,
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') {
+ (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)gethostname(spcl.c_host, NAMELEN);
+ spcl.c_host[NAMELEN-1] = '\0';
spcl.c_level = level - '0';
spcl.c_type = TS_TAPE;
if (!Tflag)
spcl.c_level = 0;
}
- msg("Date of this level %c dump: %s", level,
+ if (Mflag)
+ snprintf(tape, MAXPATHLEN, "%s%03d", tapeprefix, tapeno + 1);
+ else
+ 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));
+ spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
#else
- spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
+ spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
#endif
- msg("Date of last level %c dump: %s", lastlevel,
+ msg("Date of last level %c dump: %s", lastlevel,
#ifdef __linux__
- spcl.c_ddate == 0 ? "the epoch\n" : ctime4(&spcl.c_ddate));
+ spcl.c_ddate == 0 ? "the epoch\n" : ctime4(&spcl.c_ddate));
#else
- spcl.c_ddate == 0 ? "the epoch\n" : ctime(&spcl.c_ddate));
+ spcl.c_ddate == 0 ? "the epoch\n" : ctime(&spcl.c_ddate));
#endif
- msg("Dumping %s ", disk);
- if (dt != NULL)
- msgtail("(%s) ", dt->fs_file);
- if (host)
- msgtail("to %s on host %s\n", tape, host);
- else
- msgtail("to %s\n", tape);
- msg("Label: %s\n", labelstr);
+ 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);
+ } /* end of size estimate */
#ifdef __linux__
- retval = ext2fs_open(disk, 0, 0, 0, unix_io_manager, &fs);
+ retval = dump_fs_open(disk, &fs);
if (retval) {
com_err(disk, retval, "while opening filesystem");
if (retval == EXT2_ET_REV_TOO_HIGH)
msg("Cannot open %s\n", disk);
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;
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;
+ msg("Label: %s\n", spcl.c_label);
+
#if defined(SIGINFO)
(void)signal(SIGINFO, statussig);
#endif
- msg("mapping (Pass I) [regular files]\n");
+ if (!sizest)
+ msg("mapping (Pass I) [regular files]\n");
#ifdef __linux__
if (directory[0] == 0)
anydirskipped = mapfiles(maxino, &tapesize);
anydirskipped = mapfiles(maxino, &tapesize);
#endif
- msg("mapping (Pass II) [directories]\n");
+ if (!sizest)
+ msg("mapping (Pass II) [directories]\n");
while (anydirskipped) {
anydirskipped = mapdirs(maxino, &tapesize);
}
+ if (sizest) {
+ 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 (%.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)
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("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,"
+ " compression ratio %1.3f\n",
+ spcl.c_tapea, tapekb, rate);
+ }
- trewind();
broadcast("DUMP IS DONE!\7\7\n");
msg("DUMP IS DONE\n");
Exit(X_FINOK);
static void
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] = ' ';
+
fprintf(stderr,
- "usage: %s [-0123456789ac"
+ "%s %s\n", __progname, _DUMP_VERSION);
+ fprintf(stderr,
+ "usage:\t%s [-0123456789ac"
#ifdef KERBEROS
"k"
#endif
- "nu] [-B records] [-b blocksize] [-d density] [-f file]\n"
- " [-h level] [-s feet] [-T date] filesystem\n"
- " %s [-W | -w]\n", __progname, __progname);
+ "MnSu"
+#ifdef HAVE_ZLIB
+ "z"
+#endif
+ "] [-B records] [-b blocksize] [-d density]\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);
}
}
}
-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 's':
case 'T':
if (*argv == NULL) {
git.wh0rd.org / dump.git / blobdiff