X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=bc4de017f7b1fa0b526d9798ba9018129428e4f2;hb=d339304329df2d458e54c02eac10a27cb31d9cb1;hp=3c56b84cfb43a82330b7539c445d873b393cef8c;hpb=a29c23ccd23f2b711dd8c95f0f1757212f4a8dde;p=dump.git

diff --git a/dump/main.c b/dump/main.c
index 3c56b84..bc4de01 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -2,7 +2,7 @@
  *	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 
+ *	Stelian Pop <pop@cybercable.fr>, 1999-2000
  */
 
 /*-
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.10 1999/12/17 10:14:59 tiniou Exp $";
+	"$Id: main.c,v 1.16 2000/02/26 01:35:48 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -105,6 +105,9 @@ static long numarg __P((const char *, long, long));
 static void obsolete __P((int *, char **[]));
 static void usage __P((void));
 
+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[])
 {
@@ -141,7 +144,6 @@ main(int argc, char *argv[])
 	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");
@@ -152,9 +154,9 @@ main(int argc, char *argv[])
 
 	obsolete(&argc, &argv);
 #ifdef KERBEROS
-#define optstring "0123456789aB:b:cd:f:h:kL:Mns:ST:uWw"
+#define optstring "0123456789aB:b:cd:e:f:h:kL:Mns:ST:uWw"
 #else
-#define optstring "0123456789aB:b:cd:f:h:L:Mns:ST:uWw"
+#define optstring "0123456789aB:b:cd:e:f:h:L:Mns:ST:uWw"
 #endif
 	while ((ch = getopt(argc, argv, optstring)) != -1)
 #undef optstring
@@ -194,6 +196,14 @@ main(int argc, char *argv[])
 			if (density >= 625 && !bflag)
 				ntrec = HIGHDENSITYTREC;
 			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]);
+			break;
 
 		case 'f':		/* output file */
 			tapeprefix = optarg;
@@ -344,6 +354,12 @@ 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';
 	/*
 	 *	disk can be either the full special file name,
 	 *	the suffix of the special file name,
@@ -367,10 +383,10 @@ main(int argc, char *argv[])
 		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_spec, directory);
-			(void)strncpy(spcl.c_dev, name, NAMELEN);
-			(void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN);
+				      dt->fs_file, directory);
+			(void)strncpy(spcl.c_filesys, name, NAMELEN);
 			disk = rawname(dt->fs_spec);
 		} else {
 			(void)strncpy(spcl.c_dev, disk, NAMELEN);
@@ -421,9 +437,7 @@ main(int argc, char *argv[])
 #else
 			spcl.c_ddate == 0 ? "the epoch\n" : ctime(&spcl.c_ddate));
 #endif
-		msg("Dumping %s ", disk);
-		if (dt != NULL)
-			msgtail("(%s) ", dt->fs_file);
+		msg("Dumping %s (%s) ", disk, spcl.c_filesys);
 		if (host)
 			msgtail("to %s on host %s\n", tape, host);
 		else
@@ -514,7 +528,7 @@ main(int argc, char *argv[])
 	}
 
 	if (sizest) {
-		printf("%ld\n", tapesize + 10);
+		printf("%.0f\n", ((double)tapesize + 10) * TP_BSIZE);
 		exit(X_FINOK);
 	} /* stop here for size estimate */
 
@@ -595,6 +609,11 @@ 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;
 		(void)dumpdirino(dp, ino);
 #else
 		(void)dumpino(dp, ino);
@@ -603,8 +622,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,9 +632,14 @@ 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;
+#ifdef __linux__
+		/*
+		 * No need to check here for deleted and not yes reallocated inodes
+		 * since this is done in dumpino().
+		 */
+#endif
 		(void)dumpino(dp, ino);
 	}
 
@@ -683,7 +705,7 @@ usage(void)
 		"k"
 #endif
 		"MnSu] [-B records] [-b blocksize] [-d density]\n"
-		"\t%s [-f file] [-h level] [-s feet] [-T date] filesystem\n"
+		"\t%s [-e inode#] [-f file] [-h level] [-s feet] [-T date] filesystem\n"
 		"\t%s [-W | -w]\n", __progname, white, __progname);
 	exit(X_STARTUP);
 }