X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fmain.c;h=508ec15fab28d3734a7e8bcc90b6535ffef42bf6;hp=263945a2543d05c692ed274d4d1a321c592cf88c;hb=c993d83a80c45bdf72ac623bd7f25766c6cb7682;hpb=144a6db136ca266241860aadb1af8b2702df97fd diff --git a/dump/main.c b/dump/main.c index 263945a..508ec15 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 + * Stelian Pop , 1999-2000 + * Stelian Pop - Alcôve , 2000-2002 */ /*- @@ -40,17 +41,35 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.9 1999/11/22 19:08:50 tiniou Exp $"; + "$Id: main.c,v 1.77 2002/11/15 09:49:40 stelian Exp $"; #endif /* not lint */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include +#include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif +#include #include #include -#else -#ifdef sunos +#elif defined sunos #include #include @@ -59,77 +78,145 @@ 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 +/* + * 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; /* dump level of previous dump */ +char level; /* dump level of this dump */ +int bzipflag; /* compression is done using bzlib */ +int Afile = 0; /* archive file descriptor */ +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 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; #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 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)); + +static dump_ino_t iexclude_list[IEXCLUDE_MAXNUM];/* the inode exclude list */ +static int iexclude_num = 0; /* number of elements in the list */ 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 fstab *dt; + char *map; + int ch; + 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[NAME_MAX]; - char pathname[NAME_MAX]; + 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]; @@ -138,11 +225,11 @@ 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; - 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'; @@ -151,13 +238,29 @@ main(int argc, char *argv[]) usage(); obsolete(&argc, &argv); + +#ifdef USE_QFA + gTapeposfd = -1; +#endif /* USE_QFA */ + + while ((ch = getopt(argc, argv, + "0123456789A:aB:b:cd:e:E:f:F:h:I:" +#ifdef HAVE_BZLIB + "j::" +#endif + "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 + "mMnq" +#ifdef USE_QFA + "Q:" #endif - while ((ch = getopt(argc, argv, optstring)) != -1) -#undef optstring + "s:ST:uvWw" +#ifdef HAVE_ZLIB + "z::" +#endif + )) != -1) switch (ch) { /* dump level */ case '0': case '1': case '2': case '3': case '4': @@ -165,44 +268,96 @@ main(int argc, char *argv[]) level = ch; break; + case 'A': /* archive file */ + Apath = optarg; + if ((Afile = open(Apath, O_RDWR|O_CREAT|O_TRUNC, + S_IRUSR | S_IWUSR)) < 0) { + msg("Cannot open %s for writing: %s\n", + optarg, strerror(errno)); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } + memset(volinfo, 0, TP_NINOS * sizeof(dump_ino_t)); + break; + case 'a': /* `auto-size', Write to EOM. */ unlimited = 1; + aflag = 1; break; case 'B': /* blocks per output file */ + unlimited = 0; blocksperfile = numarg("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; + + /* 04-Feb-00 ILC */ + case 'e': /* exclude an inode */ + { + 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 */ tapeprefix = optarg; break; + case 'F': /* end of tape script */ + eot_script = optarg; + break; + case 'h': honorlevel = numarg("honor level", 0L, 10L); break; +#ifdef HAVE_BZLIB + case 'j': + compressed = 2; + bzipflag = 1; + if (optarg) + compressed = numarg("compress level", 1L, 9L); + break; +#endif /* HAVE_BZLIB */ + + case 'I': + breademax = + numarg ("number of errors to ignore", 1L, 0L); + break; + #ifdef KERBEROS case 'k': dokerberos = 1; @@ -215,17 +370,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; @@ -234,7 +393,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; @@ -245,8 +416,8 @@ 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; @@ -257,10 +428,21 @@ main(int argc, char *argv[]) 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_ZLIB + case 'z': + compressed = 2; + if (optarg) + compressed = numarg("compress level", 1L, 9L); + break; +#endif /* HAVE_ZLIB */ default: usage(); @@ -269,29 +451,29 @@ main(int argc, char *argv[]) argv += optind; if (argc < 1) { - (void)fprintf(stderr, "Must specify disk or filesystem\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"); + msg("Must specify disk or filesystem\n"); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } - if (Tflag && uflag) { - (void)fprintf(stderr, - "You cannot use the T and u flags together.\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--; + incompat_flags(Tflag && uflag, 'T', 'u'); + incompat_flags(aflag && blocksperfile, '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) + if (blocksperfile && !compressed) blocksperfile = blocksperfile / ntrec * ntrec; /* round down */ else if (!unlimited) { /* @@ -316,13 +498,15 @@ main(int argc, char *argv[]) *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 } @@ -342,8 +526,33 @@ 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. + */ + 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) { /* 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, @@ -351,44 +560,75 @@ main(int argc, char *argv[]) * 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) @@ -402,52 +642,65 @@ main(int argc, char *argv[]) } 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 (!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)); + ctime4(&spcl.c_date)); +#ifdef USE_QFA + gThisDumpDate = spcl.c_date; #endif - msg("Dumping %s ", disk); - if (dt != NULL) - msgtail("(%s) ", dt->fs_file); + 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 ((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); +#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; @@ -457,13 +710,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(); @@ -488,10 +740,22 @@ 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)); - tapesize = 3 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1); + 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); + + if (compressed) + msg("Compressing output at compression level %d (%s)\n", + compressed, bzipflag ? "bzlib" : "zlib"); + } + #if defined(SIGINFO) (void)signal(SIGINFO, statussig); #endif @@ -501,8 +765,51 @@ main(int argc, char *argv[]) #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 @@ -514,12 +821,12 @@ main(int argc, char *argv[]) } if (sizest) { - printf("%ld\n", tapesize + 10); - exit(X_STARTUP); + 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; @@ -559,11 +866,27 @@ 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 */ + 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|O_TRUNC, S_IRUSR | S_IWUSR)) < 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. */ @@ -572,11 +895,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"); @@ -595,6 +914,13 @@ main(int argc, char *argv[]) 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; + if (vflag) + msg("dumping directory inode %lu\n", ino); (void)dumpdirino(dp, ino); #else (void)dumpino(dp, ino); @@ -603,8 +929,6 @@ main(int argc, char *argv[]) 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 @@ -615,48 +939,75 @@ main(int argc, char *argv[]) * 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; - (void)dumpino(dp, ino); - } - #ifdef __linux__ - (void)time4(&(tend_writing)); -#else - (void)time((time_t *)&(tend_writing)); + /* + * No need to check here for deleted and not yet reallocated + * inodes since this is done in dumpino(). + */ #endif + 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)); + } + + tend_writing = time(NULL); spcl.c_type = TS_END; - for (i = 0; i < ntrec; i++) + + if (Afile) { + 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); - if (pipeout) - msg("DUMP: %ld tape blocks\n", spcl.c_tapea); + + tnow = trewind(); + + if (pipeout || fifoout) + 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("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); + } - msg("DUMP: Average transfer rate: %ld KB/s\n", xferrate / tapeno); + if (Afile) + msg("Archiving dump to %s\n", Apath); - trewind(); broadcast("DUMP IS DONE!\7\7\n"); msg("DUMP IS DONE\n"); Exit(X_FINOK); @@ -668,23 +1019,41 @@ static void usage(void) { char white[MAXPATHLEN]; - int i; - - strncpy(white, __progname, MAXPATHLEN-1); - white[MAXPATHLEN-1] = '\0'; - for (i=0; i