X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fmain.c;h=508ec15fab28d3734a7e8bcc90b6535ffef42bf6;hp=3d4e693fc4ea6cb8672edd8a38716cd1959f0121;hb=c993d83a80c45bdf72ac623bd7f25766c6cb7682;hpb=7ad0e4095900bf99e57eedf254d7162ef5112f43

diff --git a/dump/main.c b/dump/main.c
index 3d4e693..508ec15 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.70 2002/03/11 10:17:43 stelian Exp $";
+	"$Id: main.c,v 1.77 2002/11/15 09:49:40 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -96,6 +96,8 @@ 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 */
@@ -106,8 +108,10 @@ 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 */
@@ -177,7 +181,7 @@ long	uncomprblks = 0;/* uncompressed blocks written */
 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));
@@ -248,11 +252,11 @@ main(int argc, char *argv[])
 #ifdef KERBEROS
 			    "k"
 #endif
-			    "Mnq"
+			    "mMnq"
 #ifdef USE_QFA
 			    "Q:"
 #endif
-			    "s:ST:uWw"
+			    "s:ST:uvWw"
 #ifdef HAVE_ZLIB
 			    "z::"
 #endif
@@ -289,7 +293,7 @@ main(int argc, char *argv[])
 
 		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",
 					maxbsize/1024);
@@ -377,6 +381,10 @@ main(int argc, char *argv[])
 			}
 			break;
 
+		case 'm':		/* metadata only flag */
+			mflag = 1;
+			break;
+
 		case 'M':		/* multi-volume flag */
 			Mflag = 1;
 			break;
@@ -420,6 +428,10 @@ main(int argc, char *argv[])
 			uflag = 1;
 			break;
 
+		case 'v':		/* verbose */
+			vflag = 1;
+			break;
+
 		case 'W':		/* what to do */
 		case 'w':
 			lastdump(ch);
@@ -699,9 +711,7 @@ main(int argc, char *argv[])
 	if (TP_BSIZE != (1 << tp_bshift))
 		quit("TP_BSIZE (%d) is not a power of 2", TP_BSIZE);
 	maxino = fs->super->s_inodes_count + 1;
-#if	0
 	spcl.c_flags |= DR_NEWINODEFMT;
-#endif
 #else	/* __linux __*/
 	if ((diskfd = open(disk, O_RDONLY)) < 0) {
 		msg("Cannot open %s\n", disk);
@@ -730,7 +740,9 @@ 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));
-	if (usedinomap == NULL || dumpdirmap == NULL || dumpinomap == NULL)
+	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);
 
@@ -867,10 +879,10 @@ main(int argc, char *argv[])
 		/* 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)) != strlen(gTps))
+		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)) != strlen(gTps))
+		if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps))
 			quit("can't write tapeposfile\n");
 	}
 #endif /* USE_QFA */
@@ -907,6 +919,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);
@@ -933,7 +947,13 @@ main(int argc, char *argv[])
 		 * 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));
 	}
 
 	tend_writing = time(NULL);
@@ -1016,7 +1036,7 @@ usage(void)
 #ifdef KERBEROS
 		"k"
 #endif
-		"MnqSu"
+		"mMnqSuv"
 		"] [-A file] [-B records] [-b blocksize]\n"
 		"\t%s [-d density] [-e inode#,inode#,...] [-E file] [-f file]\n"
 		"\t%s [-h level] [-I nr errors] "
@@ -1207,10 +1227,10 @@ do_exclude_ino(dump_ino_t ino, const char *reason)
 			exit(X_STARTUP);
 		}
 		if (reason)
-			msg("Added inode %u to exclude list (%s)\n", 
+			msg("Excluding inode %u (%s) from dump\n", 
 			    ino, reason);
 		else
-			msg("Added inode %u to exclude list\n", ino);
+			msg("Excluding inode %u from dump\n", ino);
 		iexclude_list[iexclude_num++] = ino;
 	}
 }
@@ -1221,7 +1241,7 @@ do_exclude_ino_str(char * ino) {
 	unsigned long inod;
 
 	inod = strtoul(ino, &r, 10);
-	if (*r != '\0' || inod <= ROOTINO) {
+	if (( *r != '\0' && !isspace(*r) ) || inod <= ROOTINO) {
 		msg("Invalid inode argument %s\n", ino);
 		msg("The ENTIRE dump is aborted.\n");
 		exit(X_STARTUP);