X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fmain.c;h=7a5884b36ff44547e296e88f90abc38d79183d1d;hp=0d1f4fd19adb082e7ec6ec376db9ce1b6009f15a;hb=f48a055e452249091f3c6851a20431a8c87135b1;hpb=b8f7cbe65e70f2ec792c447995ba00ca360ec0c9

diff --git a/dump/main.c b/dump/main.c
index 0d1f4fd..7a5884b 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.52 2001/07/18 13:12:33 stelian Exp $";
+	"$Id: main.c,v 1.56 2001/08/13 16:17:52 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -88,6 +88,67 @@ static const char rcsid[] =
 #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 */
+
+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	uflag;		/* update flag */
+int	Mflag;		/* multi-volume flag */
+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) */
+
+#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 */
@@ -114,9 +175,11 @@ int 	maxbsize = 64*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 *));
 
-dump_ino_t iexclude_list[IEXCLUDE_MAXNUM];/* the inode exclude list */
-int iexclude_num = 0;			/* number of elements in the list */
+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[])
@@ -168,7 +231,7 @@ main(int argc, char *argv[])
 #endif /* USE_QFA */
 
 	while ((ch = getopt(argc, argv,
-			    "0123456789aB:b:cd:e:f:F:h:L:"
+			    "0123456789aB:b:cd:e:E:f:F:h:L:"
 #ifdef KERBEROS
 			    "k"
 #endif
@@ -224,19 +287,19 @@ main(int argc, char *argv[])
 			
 			                /* 04-Feb-00 ILC */
 		case 'e':		/* exclude an inode */
-			if (iexclude_num == IEXCLUDE_MAXNUM) {
-				msg("Too many -e options\n");
-				msg("The ENTIRE dump is aborted.\n");
-				exit(X_STARTUP);
+			{
+			char *p = optarg, *q;
+			while ((q = strchr(p, ','))) {
+				*q = '\0';
+				do_exclude_ino_str(p);
+				p = q + 1;
 			}
-		        iexclude_list[iexclude_num++] = numarg("inode to exclude",0L,0L);
-			if (iexclude_list[iexclude_num-1] <= ROOTINO) {
-				msg("Cannot exclude inode %ld\n", (long)iexclude_list[iexclude_num-1]);
-				msg("The ENTIRE dump is aborted.\n");
-				exit(X_STARTUP);
+			do_exclude_ino_str(p);
 			}
-			msg("Added %d to exclude list\n",
-			    iexclude_list[iexclude_num-1]);
+			break;
+
+		case 'E':		/* exclude inodes read from file */
+			do_exclude_from_file(optarg);
 			break;
 
 		case 'f':		/* output file */
@@ -743,7 +806,7 @@ main(int argc, char *argv[])
 #ifdef USE_QFA
 	if (tapepos) {
 		msg("writing QFA positions to %s\n", gTapeposfile);
-		if ((gTapeposfd = open(gTapeposfile, O_RDWR|O_CREAT)) < 0)
+		if ((gTapeposfd = open(gTapeposfile, O_RDWR|O_CREAT, S_IRUSR | S_IWUSR)) < 0)
 			quit("can't open tapeposfile\n");
 		/* print QFA-file header */
 		sprintf(gTps, "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION, (unsigned long)spcl.c_date);
@@ -888,12 +951,11 @@ usage(void)
 #endif
 		"MnSu"
 		"] [-B records] [-b blocksize] [-d density]\n"
-		"\t%s [-e inode#] [-f file] [-h level] "
+		"\t%s [-e inode#,inode#,...] [-E file] [-f file] [-h level] "
 #ifdef USE_QFA
 		"[-Q file] "
 #endif
-		"[-s feet]\n"
-		"\t%s [-T date] "
+		"\n\t%s [-s feet] [-T date] "
 #ifdef HAVE_ZLIB
 		"[-z zlevel] "
 #endif
@@ -1000,6 +1062,7 @@ obsolete(int *argcp, char **argvp[])
 		case 'b':
 		case 'd':
 		case 'e':
+		case 'E':
 		case 'f':
 		case 'F':
 		case 'h':
@@ -1041,3 +1104,78 @@ obsolete(int *argcp, char **argvp[])
 	/* Update argument count. */
 	*argcp = nargv - *argvp - 1;
 }
+
+/*
+ * This tests whether an inode is in the exclude list
+ */
+int
+exclude_ino(dump_ino_t ino)
+{
+	/* 04-Feb-00 ILC */
+	if (iexclude_num) {	/* if there are inodes in the exclude list */
+		int idx;	/* then check this inode against it */
+		for (idx = 0; idx < iexclude_num; idx++)
+			if (ino == iexclude_list[idx])
+				return 1;
+	}
+	return 0;
+}
+
+/*
+ * This tests adds an inode to the exclusion list if it isn't already there
+ */
+void
+do_exclude_ino(dump_ino_t ino, const char *reason)
+{
+	if (!exclude_ino(ino)) {
+		if (iexclude_num == IEXCLUDE_MAXNUM) {
+			msg("Too many exclude options\n");
+			msg("The ENTIRE dump is aborted.\n");
+			exit(X_STARTUP);
+		}
+		if (reason)
+			msg("Added inode %u to exclude list (%s)\n", 
+			    ino, reason);
+		else
+			msg("Added inode %u to exclude list\n", ino);
+		iexclude_list[iexclude_num++] = ino;
+	}
+}
+
+static void
+do_exclude_ino_str(char * ino) {
+	char *r;
+	unsigned long inod;
+
+	inod = strtoul(ino, &r, 10);
+	if (*r != '\0' || 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);
+}