X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=32375a3a07892eea9d78eec15d7f9fb9dcd55ec3;hb=aae080c2bfb6fd1e8311134cdb612d87236b4d03;hp=f5fd9893b875bb818bf95d95ac4dd2a9e06379ec;hpb=a2c9bd286cf061b9c6e6565474c1af77e8cf2d1e;p=dump.git

diff --git a/dump/main.c b/dump/main.c
index f5fd989..32375a3 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 <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
  */
 
 /*-
@@ -40,17 +41,29 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.14 2000/01/26 11:38:08 stelian Exp $";
+	"$Id: main.c,v 1.39 2001/03/20 20:46:08 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>
@@ -59,26 +72,12 @@ static const char rcsid[] =
 #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)
@@ -95,6 +94,9 @@ 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;
@@ -105,31 +107,30 @@ static long numarg __P((const char *, long, long));
 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;
 #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];
@@ -138,11 +139,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,12 +152,17 @@ main(int argc, char *argv[])
 		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:Mns:ST:uWw"
-#else
-#define optstring "0123456789aB:b:cd:f:h:L:Mns:ST: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 */
@@ -170,6 +176,7 @@ main(int argc, char *argv[])
 			break;
 
 		case 'B':		/* blocks per output file */
+			unlimited = 0;
 			blocksperfile = numarg("number of blocks per file",
 			    1L, 0L);
 			break;
@@ -186,19 +193,40 @@ main(int argc, char *argv[])
 			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 */
 			tapeprefix = optarg;
 			break;
 
+		case 'F':		/* end of tape script */
+			eot_script = optarg;
+			break;
+
 		case 'h':
 			honorlevel = numarg("honor level", 0L, 10L);
 			break;
@@ -215,14 +243,14 @@ 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;
 
@@ -235,6 +263,7 @@ main(int argc, char *argv[])
 			break;
 
 		case 's':		/* tape size, feet */
+			unlimited = 0;
 			tsize = numarg("tape size", 1L, 0L) * 12 * 10;
 			break;
 
@@ -261,6 +290,13 @@ main(int argc, char *argv[])
 		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();
@@ -272,7 +308,12 @@ main(int argc, char *argv[])
 		(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:");
@@ -344,12 +385,22 @@ main(int argc, char *argv[])
 		signal(SIGINT, SIG_IGN);
 	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] == '/')
+		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,
@@ -360,41 +411,60 @@ main(int argc, char *argv[])
 		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)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
-			(void)sprintf(name, "%s (dir %s)",
-				      dt->fs_file, directory);
-			(void)strncpy(spcl.c_filesys, name, NAMELEN);
+		/*
+		 * The argument could be now a mountpoint of
+		 * a filesystem specified in fstab. Search for it.
+		 */
+		if ((dt = fstabsearch(pathname)) != NULL) {
 			disk = rawname(dt->fs_spec);
+			(void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
+			(void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN);
 		} else {
-			(void)strncpy(spcl.c_dev, disk, NAMELEN);
-			(void)strncpy(spcl.c_filesys, "an unlisted file system",
-			    NAMELEN);
+			/*
+			 * The argument was not found in the fstab
+			 * assume that this is a subtree and search for it
+			 */
+			dt = fstabsearchdir(pathname, directory);
+			if (dt != NULL) {
+				char name[MAXPATHLEN];
+				(void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
+				(void)snprintf(name, sizeof(name), "%s (dir %s)",
+					      dt->fs_file, directory);
+				(void)strncpy(spcl.c_filesys, name, NAMELEN);
+				disk = rawname(dt->fs_spec);
+			} else {
+				(void)strncpy(spcl.c_dev, disk, NAMELEN);
+				(void)strncpy(spcl.c_filesys, "an unlisted file system",
+				    NAMELEN);
+			}
 		}
-	}
 #else
-	} 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)
@@ -408,32 +478,23 @@ 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 (!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
+		    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__
@@ -453,6 +514,16 @@ main(int argc, char *argv[])
 		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;
@@ -492,10 +563,17 @@ 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);
+	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 (compressed)
+		msg("Compressing output at compression level %d\n", compressed);
+
 #if defined(SIGINFO)
 	(void)signal(SIGINFO, statussig);
 #endif
@@ -518,12 +596,12 @@ main(int argc, char *argv[])
 	}
 
 	if (sizest) {
-		printf("%.0f\n", ((double)tapesize + 10) * TP_BSIZE);
+		printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE);
 		exit(X_FINOK);
 	} /* stop here for size estimate */
 
 	if (pipeout || unlimited) {
-		tapesize += 10;	/* 10 trailer blocks */
+		tapesize += 11;	/* 10 trailer blocks + 1 map header */
 		msg("estimated %ld tape blocks.\n", tapesize);
 	} else {
 		double fetapes;
@@ -576,11 +654,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");
@@ -633,19 +707,21 @@ main(int argc, char *argv[])
 		(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++)
 		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)
@@ -655,20 +731,20 @@ main(int argc, char *argv[])
 		    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);
@@ -680,23 +756,33 @@ 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] = ' ';
+	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]\n"
+		"\t%s [-d density] [-e inode#] [-f file] [-h level] [-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);
 }
 
@@ -744,8 +830,8 @@ sig(int signo)
 	}
 }
 
-char *
-rawname(char *cp)
+const char *
+rawname(const char *cp)
 {
 #ifdef	__linux__
 	return cp;
@@ -755,10 +841,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);
@@ -798,8 +882,11 @@ obsolete(int *argcp, char **argvp[])
 		case 'B':
 		case 'b':
 		case 'd':
+		case 'e':
 		case 'f':
+		case 'F':
 		case 'h':
+		case 'L':
 		case 's':
 		case 'T':
 			if (*argv == NULL) {