X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fmain.c;h=b73a7887012475bfdd86f4953e5c0110679f59cb;hp=c2e4eaf329c94e77e671c50915ec4e027313d792;hb=97be3358a32b246d4336692ebad4b1c366446932;hpb=79e318657e7faa7b2951ff554dc6f1b92624a477 diff --git a/dump/main.c b/dump/main.c index c2e4eaf..b73a788 100644 --- a/dump/main.c +++ b/dump/main.c @@ -2,7 +2,8 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999-2000 + * Stelian Pop , 1999-2000 + * Stelian Pop - Alcôve , 2000-2002 */ /*- @@ -17,11 +18,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -40,17 +37,38 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.23 2000/08/19 23:48:10 stelian Exp $"; + "$Id: main.c,v 1.94 2004/07/05 15:12:45 stelian Exp $"; #endif /* not lint */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include +#include #ifdef __linux__ +#include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif +#include #include #include -#else -#ifdef sunos +#include /* for definition of BLKFLSBUF */ +#elif defined sunos #include #include @@ -59,80 +77,151 @@ static const char rcsid[] = #include #include #endif -#endif #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef __linux__ -#include -#endif - #include "dump.h" #include "pathnames.h" +#include "bylabel.h" #ifndef SBOFF #define SBOFF (SBLOCK * DEV_BSIZE) #endif +int abortifconnerr = 1; /* set to 1 if lib dumprmt.o should exit on connection errors + otherwise just print a message using msg */ +/* + * Dump maps used to describe what is to be dumped. + */ +int mapsize; /* size of the state maps */ +char *usedinomap; /* map of allocated inodes */ +char *dumpdirmap; /* map of directories to be dumped */ +char *dumpinomap; /* map of files to be dumped */ +char *metainomap; /* which of the inodes in dumpinomap will get + only their metadata dumped */ + +const char *disk; /* name of the disk file */ +char tape[MAXPATHLEN];/* name of the tape file */ +char *tapeprefix; /* prefix of the tape file */ +char *dumpdates; /* name of the file containing dump date information*/ +char lastlevel[NUM_STR_SIZE];/* dump level of previous dump */ +char level[NUM_STR_SIZE];/* dump level of this dump */ +int zipflag; /* which compression method */ +int Afile = -1; /* archive file descriptor */ +int AfileActive = 1;/* Afile flag */ +int uflag; /* update flag */ +int mflag; /* dump metadata only if possible */ +int Mflag; /* multi-volume flag */ +int qflag; /* quit on errors flag */ +int vflag; /* verbose flag */ +int breademax = 32; /* maximum number of bread errors before we quit */ +char *eot_script; /* end of volume script fiag */ +int diskfd; /* disk file descriptor */ +int tapefd; /* tape file descriptor */ +int pipeout; /* true => output to standard output */ +int fifoout; /* true => output to fifo */ +dump_ino_t curino; /* current inumber; used globally */ +int newtape; /* new tape flag */ +int density; /* density in 0.1" units */ +long tapesize; /* estimated tape size, blocks */ +long tsize; /* tape size in 0.1" units */ +long asize; /* number of 0.1" units written on current tape */ +int etapes; /* estimated number of tapes */ +int nonodump; /* if set, do not honor UF_NODUMP user flags */ +int unlimited; /* if set, write to end of medium */ +int compressed; /* if set, dump is to be compressed */ +long long bytes_written;/* total bytes written to tape */ +long uncomprblks; /* uncompressed blocks written to tape */ +int notify; /* notify operator flag */ +int blockswritten; /* number of blocks written on current tape */ +int tapeno; /* current tape number */ +time_t tstart_writing; /* when started writing the first tape block */ +time_t tend_writing; /* after writing the last tape block */ +#ifdef __linux__ +ext2_filsys fs; +#else +struct fs *sblock; /* the file system super block */ +char sblock_buf[MAXBSIZE]; +#endif +long xferrate; /* averaged transfer rate of all volumes */ +long dev_bsize; /* block size of underlying disk device */ +int dev_bshift; /* log2(dev_bsize) */ +int tp_bshift; /* log2(TP_BSIZE) */ +dump_ino_t volinfo[TP_NINOS];/* which inode on which volume archive info */ + +#ifdef USE_QFA +int gTapeposfd; +char *gTapeposfile; +char gTps[255]; +int32_t gThisDumpDate; +#endif /* USE_QFA */ + +struct dumptime *dthead; /* head of the list version */ +int nddates; /* number of records (might be zero) */ +int ddates_in; /* we have read the increment file */ +struct dumpdates **ddatev; /* the arrayfied version */ + int notify = 0; /* notify operator flag */ int blockswritten = 0; /* number of blocks written on current tape */ int tapeno = 0; /* current tape number */ int density = 0; /* density in bytes/0.1" " <- this is for hilit19 */ -int ntrec = NTREC; /* # tape blocks in each tape record */ +int ntrec = NTREC; /* # 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 */ +long *blocksperfiles = NULL; /* output blocks per file(s) */ 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 */ + +long smtc_errno; #ifdef __linux__ char *__progname; #endif -int maxbsize = 64*1024; /* XXX MAXBSIZE from sys/param.h */ +int maxbsize = 1024*1024; /* XXX MAXBSIZE from sys/param.h */ static long numarg __P((const char *, long, long)); +static long *numlistarg __P((const char *, long, long)); static void obsolete __P((int *, char **[])); static void usage __P((void)); +static void do_exclude_from_file __P((char *)); +static void do_exclude_ino_str __P((char *)); +static void incompat_flags __P((int, char, char)); -ino_t iexclude_list[IEXCLUDE_MAXNUM]; /* the inode exclude list */ -int iexclude_num = 0; /* number of elements in the list */ +static char* iexclude_bitmap = NULL; /* the inode exclude bitmap */ +static unsigned int iexclude_bitmap_bytes = 0; /* size of bitmap in bytes */ int main(int argc, char *argv[]) { - register 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 ino; + int dirty; + struct dinode *dp; + struct mntent *dt; + char *map; + int ch, pch = 0; + int i, anydirskipped; + int aflag = 0, bflag = 0, Tflag = 0, honorlevel = 1; + dump_ino_t maxino; + struct STAT statbuf; + dev_t filedev = 0; #ifdef __linux__ errcode_t retval; char directory[MAXPATHLEN]; char pathname[MAXPATHLEN]; #endif time_t tnow; - char labelstr[LBLSIZE]; + char *diskparam; + char *Apath = NULL; - 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]; @@ -141,69 +230,115 @@ main(int argc, char *argv[]) #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; - 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'; + memset(&lastlevel, 0, NUM_STR_SIZE); + memset(&level, 0, NUM_STR_SIZE); if (argc < 2) usage(); obsolete(&argc, &argv); + +#ifdef USE_QFA + gTapeposfd = -1; +#endif /* USE_QFA */ + + while ((ch = getopt(argc, argv, + "0123456789A:aB:b:cd:D:e:E:f:F:h:I:" +#ifdef HAVE_BZLIB + "j::" +#endif + "L:" #ifdef KERBEROS -#define optstring "0123456789aB:b:cd:e:f:F:h:kL:Mns:ST:uWw" -#else -#define optstring "0123456789aB:b:cd:e:f:F:h:L:Mns:ST:uWw" + "k" +#endif + "mMnq" +#ifdef USE_QFA + "Q:" +#endif + "s:ST:uvWw" +#ifdef HAVE_LZO + "y" +#endif +#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': case '5': case '6': case '7': case '8': case '9': - level = ch; + if ((pch >= '0') && (pch <= '9') && (strlen(level) < NUM_STR_SIZE)) + level[strlen(level)] = ch; + else + level[0] = ch; + pch = ch; + break; + + case 'A': /* archive file */ + Apath = optarg; break; case 'a': /* `auto-size', Write to EOM. */ unlimited = 1; + aflag = 1; break; case 'B': /* blocks per output file */ - blocksperfile = numarg("number of blocks per file", + unlimited = 0; + blocksperfiles = numlistarg("number of blocks per file", 1L, 0L); break; case 'b': /* blocks per tape write */ ntrec = numarg("number of blocks per write", - 1L, 1000L); + 1L, 1048576L); 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; + + case 'D': /* path of dumpdates file */ + dumpdates = optarg; 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]); + { + char *p = optarg, *q; + while ((q = strchr(p, ','))) { + *q = '\0'; + do_exclude_ino_str(p); + p = q + 1; + } + do_exclude_ino_str(p); + } + break; + + case 'E': /* exclude inodes read from file */ + do_exclude_from_file(optarg); break; case 'f': /* output file */ @@ -218,6 +353,20 @@ main(int argc, char *argv[]) honorlevel = numarg("honor level", 0L, 10L); break; +#ifdef HAVE_BZLIB + case 'j': + compressed = 2; + zipflag = COMPRESS_BZLIB; + if (optarg) + compressed = numarg("compress level", 1L, 9L); + break; +#endif /* HAVE_BZLIB */ + + case 'I': + breademax = + numarg ("number of errors to ignore", 0L, 0L); + break; + #ifdef KERBEROS case 'k': dokerberos = 1; @@ -230,17 +379,21 @@ main(int argc, char *argv[]) * 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': /* metadata only flag */ + mflag = 1; + break; + case 'M': /* multi-volume flag */ Mflag = 1; break; @@ -249,7 +402,19 @@ main(int argc, char *argv[]) notify = 1; break; + case 'q': + qflag = 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; @@ -260,22 +425,41 @@ main(int argc, char *argv[]) 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; - lastlevel = '?'; + lastlevel[0] = '?'; lastlevel[1] = '\0'; break; case 'u': /* update dumpdates */ uflag = 1; break; + case 'v': /* verbose */ + vflag = 1; + break; + case 'W': /* what to do */ case 'w': lastdump(ch); exit(X_FINOK); /* do nothing else */ +#ifdef HAVE_LZO + case 'y': + compressed = 2; + zipflag = COMPRESS_LZO; + break; +#endif /* HAVE_LZO */ + +#ifdef HAVE_ZLIB + case 'z': + compressed = 2; + zipflag = COMPRESS_ZLIB; + if (optarg) + compressed = numarg("compress level", 1L, 9L); + break; +#endif /* HAVE_ZLIB */ default: usage(); @@ -284,34 +468,31 @@ main(int argc, char *argv[]) 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++; - if (strlen(disk) >= MAXPATHLEN) { - (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", disk); + 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 (argc >= 1) { - (void)fprintf(stderr, "Unknown arguments to dump:"); - while (argc--) - (void)fprintf(stderr, " %s", *argv++); - (void)fprintf(stderr, "\n"); - exit(X_STARTUP); - } - if (Tflag && uflag) { - (void)fprintf(stderr, - "You cannot use the T and u flags together.\n"); - exit(X_STARTUP); - } + incompat_flags(Tflag && uflag, 'T', 'u'); + incompat_flags(aflag && blocksperfiles, 'a', 'B'); + incompat_flags(aflag && cartridge, 'a', 'c'); + incompat_flags(aflag && density, 'a', 'd'); + incompat_flags(aflag && tsize, 'a', 's'); + if (strcmp(tapeprefix, "-") == 0) { pipeout++; tapeprefix = "standard output"; } - if (blocksperfile) - blocksperfile = blocksperfile / ntrec * ntrec; /* round down */ + if (blocksperfiles && !compressed) + for (i = 1; i <= *blocksperfiles; i++) + blocksperfiles[i] = blocksperfiles[i] / ntrec * ntrec; /* round down */ else if (!unlimited) { /* * Determine how to default tape size and density @@ -329,23 +510,45 @@ main(int argc, char *argv[]) tsize = cartridge ? 1700L*120L : 2300L*120L; } - if (strchr(tapeprefix, ':')) { - host = tapeprefix; - tapeprefix = strchr(host, ':'); - *tapeprefix++ = '\0'; + { + int i; + char *n; + + if ((n = strchr(tapeprefix, ':'))) { + for (i = 0; i < (n - tapeprefix); i++) { + if (tapeprefix[i] == '/') + break; + } + if (tapeprefix[i] != '/') { + host = tapeprefix; + tapeprefix = strchr(host, ':'); + *tapeprefix++ = '\0'; #ifdef RDUMP - if (index(tapeprefix, '\n')) { - (void)fprintf(stderr, "invalid characters in tape\n"); - exit(X_STARTUP); - } - if (rmthost(host) == 0) - exit(X_STARTUP); + if (index(tapeprefix, '\n')) { + 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"); - exit(X_STARTUP); + msg("remote dump not enabled\n"); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); #endif + } + } } + (void)setuid(getuid()); /* rmthost() is the only reason to be setuid */ + if (Apath && (Afile = open(Apath, O_WRONLY|O_CREAT|O_TRUNC, + S_IRUSR | S_IWUSR | S_IRGRP | + S_IWGRP | S_IROTH | S_IWOTH)) < 0) { + msg("Cannot open %s for writing: %s\n", + optarg, strerror(errno)); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } if (signal(SIGHUP, SIG_IGN) != SIG_IGN) signal(SIGHUP, sig); @@ -361,14 +564,29 @@ main(int argc, char *argv[]) signal(SIGTERM, sig); if (signal(SIGINT, interrupt) == SIG_IGN) signal(SIGINT, SIG_IGN); +#ifdef SIGXCPU + signal(SIGXCPU, SIG_IGN); +#endif /* SIGXCPU */ +#ifdef SIGXFSZ + signal(SIGXFSZ, SIG_IGN); +#endif /* SIGXFSZ */ + 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'; + i = strlen(diskparam) - 1; + if (i > 1 && diskparam[i] == '/') + if (!(i == 6 && !strcmp(diskparam, "LABEL=/"))) + diskparam[i] = '\0'; + + disk = get_device_name(diskparam); + if (!disk) + disk = strdup(diskparam); + /* * disk can be either the full special file name, * the suffix of the special file name, @@ -376,57 +594,76 @@ main(int argc, char *argv[]) * the file system name with or without the leading '/'. */ if ((dt = fstabsearch(disk)) != NULL) { - 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__ + /* 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->mnt_fsname); + (void)strncpy(spcl.c_dev, dt->mnt_fsname, NAMELEN); + (void)strncpy(spcl.c_filesys, dt->mnt_dir, NAMELEN); } 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)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); + /* + * The argument could be now a mountpoint of + * a filesystem specified in fstab. Search for it. + */ + if ((dt = fstabsearch(pathname)) != NULL) { + disk = rawname(dt->mnt_fsname); + (void)strncpy(spcl.c_dev, dt->mnt_fsname, NAMELEN); + (void)strncpy(spcl.c_filesys, dt->mnt_dir, 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->mnt_fsname, NAMELEN); + (void)snprintf(name, sizeof(name), "%s (dir %s)", + dt->mnt_dir, directory); + (void)strncpy(spcl.c_filesys, name, NAMELEN); + disk = rawname(dt->mnt_fsname); + } 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 + } if (directory[0] != 0) { - if (level != '0') { - (void)fprintf(stderr, "Only level 0 dumps are allowed on a subdirectory\n"); + if (atoi(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) { - (void)fprintf(stderr, "You can't update the dumpdates file when dumping a subdirectory\n"); + 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)strncpy(spcl.c_label, labelstr, sizeof(spcl.c_label) - 1); + spcl.c_dev[NAMELEN-1] = '\0'; + spcl.c_filesys[NAMELEN-1] = '\0'; (void)gethostname(spcl.c_host, NAMELEN); - spcl.c_level = level - '0'; + spcl.c_host[NAMELEN-1] = '\0'; + spcl.c_level = atoi(level); spcl.c_type = TS_TAPE; if (!Tflag) getdumptime(uflag); /* dumpdates snarfed */ @@ -434,7 +671,7 @@ main(int argc, char *argv[]) if (spcl.c_ddate == 0 && spcl.c_level) { msg("WARNING: There is no inferior level dump on this filesystem\n"); msg("WARNING: Assuming a level 0 dump by default\n"); - level = '0'; + level[0] = '0'; level[1] = '\0'; spcl.c_level = 0; } @@ -444,45 +681,60 @@ main(int argc, char *argv[]) strncpy(tape, tapeprefix, MAXPATHLEN); tape[MAXPATHLEN - 1] = '\0'; + if (!pipeout) { + if (STAT(tape, &statbuf) != -1) + fifoout= statbuf.st_mode & S_IFIFO; + } + 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)); + msg("Date of this level %s dump: %s", level, + ctime4(&spcl.c_date)); +#ifdef USE_QFA + gThisDumpDate = spcl.c_date; #endif + if (spcl.c_ddate) + msg("Date of last level %s 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 ((diskfd = OPEN(disk, O_RDONLY)) < 0) { + msg("Cannot open %s\n", disk); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } +#ifdef BLKFLSBUF + (void)ioctl(diskfd, BLKFLSBUF, 0); +#endif retval = dump_fs_open(disk, &fs); 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) { - 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; @@ -492,13 +744,12 @@ main(int argc, char *argv[]) tp_bshift = ffs(TP_BSIZE) - 1; if (TP_BSIZE != (1 << tp_bshift)) quit("TP_BSIZE (%d) is not a power of 2", TP_BSIZE); - maxino = fs->super->s_inodes_count; -#if 0 + maxino = fs->super->s_inodes_count + 1; spcl.c_flags |= DR_NEWINODEFMT; -#endif #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(); @@ -523,10 +774,28 @@ main(int argc, char *argv[]) usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char)); dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char)); dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char)); + metainomap = (char *)calloc((unsigned) mapsize, sizeof(char)); + if (usedinomap == NULL || dumpdirmap == NULL || + dumpinomap == NULL || metainomap == 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); + + msg("Writing %d Kilobyte records\n", ntrec); + + if (compressed) { + if (zipflag == COMPRESS_LZO) + msg("Compressing output (lzo)\n"); + else + msg("Compressing output at compression level %d (%s)\n", + compressed, zipflag == COMPRESS_ZLIB ? "zlib" : "bzlib"); + } + } + #if defined(SIGINFO) (void)signal(SIGINFO, statussig); #endif @@ -536,8 +805,51 @@ main(int argc, char *argv[]) #ifdef __linux__ if (directory[0] == 0) anydirskipped = mapfiles(maxino, &tapesize); - else - anydirskipped = mapfilesfromdir(maxino, &tapesize, directory); + else { + if (LSTAT(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 (LSTAT(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->mnt_dir)); + else + /* read directory inodes. + * NOTE: nested directories are not recognized + * so inodes may be umped twice! + */ + anydirskipped2 = mapfilesfromdir(maxino, &tapesize, + p+strlen(dt->mnt_dir)); + if (!anydirskipped) + anydirskipped = anydirskipped2; + argv++; + } #else anydirskipped = mapfiles(maxino, &tapesize); #endif @@ -549,19 +861,31 @@ main(int argc, char *argv[]) } if (sizest) { - printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE); + printf("%.0f\n", ((double)tapesize + 1 + ntrec) * TP_BSIZE); exit(X_FINOK); } /* stop here for size estimate */ if (pipeout || unlimited) { - tapesize += 11; /* 10 trailer blocks + 1 map header */ - msg("estimated %ld tape blocks.\n", tapesize); + tapesize += 1 + ntrec; /* 1 map header + trailer blocks */ + msg("estimated %ld blocks.\n", tapesize); } else { double fetapes; - if (blocksperfile) - fetapes = (double) tapesize / blocksperfile; - else if (cartridge) { + if (blocksperfiles) { + long tapesize_left; + + tapesize_left = tapesize; + fetapes = 0; + for (i = 1; i < *blocksperfiles && tapesize_left; i++) { + fetapes++; + if (tapesize_left > blocksperfiles[i]) + tapesize_left -= blocksperfiles[i]; + else + tapesize_left = 0; + } + if (tapesize_left) + fetapes += (double)tapesize_left / blocksperfiles[*blocksperfiles]; + } else if (cartridge) { /* Estimate number of tapes, assuming streaming stops at the end of each block written, and not in mid-block. Assume no erroneous blocks; this can be compensated @@ -594,11 +918,30 @@ main(int argc, char *argv[]) /* 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 */ - msg("estimated %ld tape blocks on %3.2f tape(s).\n", + tapesize += etapes + ntrec; /* headers + trailer blks */ + msg("estimated %ld 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_WRONLY|O_CREAT|O_TRUNC, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP + | S_IROTH | S_IWOTH)) < 0) + quit("can't open tapeposfile\n"); + /* print QFA-file header */ + snprintf(gTps, sizeof(gTps), "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION, (unsigned long)spcl.c_date); + gTps[sizeof(gTps) - 1] = '\0'; + if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps)) + quit("can't write tapeposfile\n"); + sprintf(gTps, "ino\ttapeno\ttapepos\n"); + if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps)) + quit("can't write tapeposfile\n"); + } +#endif /* USE_QFA */ + /* * Allocate tape buffer. */ @@ -607,11 +950,7 @@ main(int argc, char *argv[]) "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"); @@ -635,6 +974,8 @@ main(int argc, char *argv[]) */ if (dp->di_nlink == 0 || dp->di_dtime != 0) continue; + if (vflag) + msg("dumping directory inode %lu\n", ino); (void)dumpdirino(dp, ino); #else (void)dumpino(dp, ino); @@ -657,52 +998,70 @@ main(int argc, char *argv[]) continue; #ifdef __linux__ /* - * No need to check here for deleted and not yes reallocated inodes - * since this is done in dumpino(). + * No need to check here for deleted and not yet reallocated + * inodes since this is done in dumpino(). */ #endif - (void)dumpino(dp, ino); + if (vflag) { + if (mflag && TSTINO(ino, metainomap)) + msg("dumping regular inode %lu (meta only)\n", ino); + else + msg("dumping regular inode %lu\n", ino); + } + (void)dumpino(dp, ino, mflag && TSTINO(ino, metainomap)); } -#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++) + + if (Afile >= 0) { + volinfo[1] = ROOTINO; + memcpy(spcl.c_inos, volinfo, TP_NINOS * sizeof(dump_ino_t)); + spcl.c_flags |= DR_INODEINFO; + } + + /* + * 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("%ld tape blocks (%.2fMB)\n", spcl.c_tapea, + if (pipeout || fifoout) + msg("%ld blocks (%.2fMB)\n", spcl.c_tapea, ((double)spcl.c_tapea * TP_BSIZE / 1048576)); else - msg("%ld tape blocks (%.2fMB) on %d volume(s)\n", + msg("%ld 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)); putdumptime(); -#ifdef __linux__ - msg("Date of this level %c dump: %s", level, + msg("Date of this level %s dump: %s", level, spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date)); -#else - msg("Date of this level %c dump: %s", level, - spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date)); -#endif msg("Date this dump completed: %s", ctime(&tnow)); - msg("Average transfer rate: %ld KB/s\n", xferrate / tapeno); + 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); + } + + if (Afile >= 0) + msg("Archiving dump to %s\n", Apath); broadcast("DUMP IS DONE!\7\7\n"); msg("DUMP IS DONE\n"); @@ -715,23 +1074,44 @@ static void usage(void) { char white[MAXPATHLEN]; - int i; - - strncpy(white, __progname, MAXPATHLEN-1); - white[MAXPATHLEN-1] = '\0'; - for (i=0; i vmax)) + errx(X_STARTUP, "%s must be between %ld and %ld", meaning, vmin, vmax); + *vals = valnum; + if (*p) p++; + } while(*p); + return (vals); +} + void sig(int signo) { @@ -763,9 +1174,9 @@ sig(int signo) case SIGHUP: case SIGTERM: case SIGTRAP: - if (pipeout) + if (pipeout || fifoout) 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(); @@ -779,8 +1190,8 @@ sig(int signo) } } -char * -rawname(char *cp) +const char * +rawname(const char *cp) { #ifdef __linux__ return cp; @@ -790,10 +1201,8 @@ rawname(char *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); @@ -830,14 +1239,18 @@ obsolete(int *argcp, char **argvp[]) for (flags = 0; *ap; ++ap) { switch (*ap) { + case 'A': case 'B': case 'b': case 'd': + case 'D': case 'e': + case 'E': case 'f': case 'F': case 'h': case 'L': + case 'Q': case 's': case 'T': if (*argv == NULL) { @@ -874,3 +1287,113 @@ obsolete(int *argcp, char **argvp[]) /* Update argument count. */ *argcp = nargv - *argvp - 1; } + +/* + * This tests whether an inode is in the exclude bitmap + */ +int +exclude_ino(dump_ino_t ino) +{ + /* if the inode exclude bitmap exists and covers given inode */ + if (iexclude_bitmap && iexclude_bitmap_bytes > ino / 8) { + /* then check this inode against it */ + int idx = iexclude_bitmap[ino / 8]; + if (idx & (1 << (ino % 8))) + return 1; + } + return 0; +} + +/* + * This adds an inode to the exclusion bitmap if it isn't already there + */ +void +do_exclude_ino(dump_ino_t ino, const char *reason) +{ + if (exclude_ino(ino)) + return; + + if (vflag) { + if (reason) + msg("Excluding inode %u (%s) from dump\n", ino, reason); + else + msg("Excluding inode %u from dump\n", ino); + } + + /* check for enough mem; initialize */ + if ((ino/8 + 1) > iexclude_bitmap_bytes) { + if (iexclude_bitmap_bytes == 0) { + unsigned int j; + iexclude_bitmap_bytes = 2 * (ino/8 + 1); + iexclude_bitmap = (char*) malloc(iexclude_bitmap_bytes); + if (iexclude_bitmap == NULL) { + msg("allocating memory failed\n"); + exit(X_STARTUP); + } + for (j = 0; j < iexclude_bitmap_bytes; j++) + iexclude_bitmap[j] = 0; + } + else { + unsigned int oldsize = iexclude_bitmap_bytes; + iexclude_bitmap_bytes *= + (ino / 8 + 1) / iexclude_bitmap_bytes + 1; + iexclude_bitmap = (char*) realloc(iexclude_bitmap, + iexclude_bitmap_bytes); + if (iexclude_bitmap == NULL) { + msg("allocating memory failed\n"); + exit(X_STARTUP); + } + for( ; oldsize < iexclude_bitmap_bytes; oldsize++) + iexclude_bitmap[oldsize] = 0; + } + } + + iexclude_bitmap[ino / 8] |= 1 << (ino % 8); +} + +static void +do_exclude_ino_str(char * ino) { + char *r; + unsigned long inod; + + inod = strtoul(ino, &r, 10); + if (( *r != '\0' && !isspace(*r) ) || inod <= ROOTINO) { + msg("Invalid inode argument %s\n", ino); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } + do_exclude_ino(inod, NULL); +} + +/* + * This reads a file containing one inode number per line and exclude them all + */ +static void +do_exclude_from_file(char *file) { + FILE *f; + char *p, fname[MAXPATHLEN]; + + + if (!( f = fopen(file, "r")) ) { + msg("Cannot open file for reading: %s\n", file); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } + while (( p = fgets(fname, MAXPATHLEN, f))) { + if ( *p && *(p + strlen(p) - 1) == '\n' ) /* possible null string */ + *(p + strlen(p) - 1) = '\0'; + if ( !*p ) /* skip empty lines */ + continue; + do_exclude_ino_str(p); + } + fclose(f); +} + +static void incompat_flags(int cond, char flag1, char flag2) { + if (cond) { + msg("You cannot use the %c and %c flags together.\n", + flag1, flag2); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } +}