X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=007a37d8b0fbc97171de505be17f4fe4d07e3cdd;hb=67793be06d93a6c433acaf6a3c7063d203acf583;hp=d1e8c5f59e58547a11714d0d979771ad9f60561c;hpb=c3f69f06e7c87a8e39d2bc02396fa3ba8db76e84;p=dump.git

diff --git a/dump/main.c b/dump/main.c
index d1e8c5f..007a37d 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -18,11 +18,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -41,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.83 2003/03/26 10:58:22 stelian Exp $";
+	"$Id: main.c,v 1.86 2003/05/12 14:16:39 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -105,7 +101,7 @@ 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	zipflag;	/* which compression method */
 int	Afile = -1;	/* archive file descriptor */
 int	AfileActive = 1;/* Afile flag */
 int	uflag;		/* update flag */
@@ -190,8 +186,8 @@ 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 */
+static char* iexclude_bitmap = NULL;	/* the inode exclude bitmap */
+static int iexclude_bitmap_bytes = 0;	/* size of bitmap in bytes */
 
 int
 main(int argc, char *argv[])
@@ -258,6 +254,9 @@ main(int argc, char *argv[])
 			    "Q:"
 #endif
 			    "s:ST:uvWw"
+#ifdef HAVE_LZO
+			    "y"
+#endif
 #ifdef HAVE_ZLIB
 			    "z::"
 #endif
@@ -344,7 +343,7 @@ main(int argc, char *argv[])
 #ifdef HAVE_BZLIB
 		case 'j':
 			compressed = 2;
-			bzipflag = 1;
+			zipflag = COMPRESS_BZLIB;
 			if (optarg)
 				compressed = numarg("compress level", 1L, 9L);
 			break;
@@ -433,9 +432,17 @@ main(int argc, char *argv[])
 		case 'w':
 			lastdump(ch);
 			exit(X_FINOK);	/* do nothing else */
+#ifdef HAVE_LZO
+		case 'y':
+                	compressed = 2;
+			zipflag = COMPRESS_LZO;
+			break;
+#endif /* HAVE_LZO */
+
 #ifdef HAVE_ZLIB
 		case 'z':
 			compressed = 2;
+			zipflag = COMPRESS_ZLIB;
 			if (optarg)
 				compressed = numarg("compress level", 1L, 9L);
 			break;
@@ -758,9 +765,13 @@ main(int argc, char *argv[])
 		
 		msg("Writing %d Kilobyte records\n", ntrec);
 
-		if (compressed)
-			msg("Compressing output at compression level %d (%s)\n", 
-			    compressed, bzipflag ? "bzlib" : "zlib");
+		if (compressed) {
+			if (zipflag == COMPRESS_LZO) 
+				msg("Compressing output (lzo)\n");
+			else
+				msg("Compressing output at compression level %d (%s)\n", 
+					compressed, zipflag == COMPRESS_ZLIB ? "zlib" : "bzlib");
+		}
 	}
 
 #if defined(SIGINFO)
@@ -1054,10 +1065,13 @@ usage(void)
 		"[-j zlevel] "
 #endif
 #ifdef USE_QFA
-		"[-Q file] "
+		"[-Q file]\n"
+#endif
+		"\t%s [-s feet] "
+		"[-T date] "
+#ifdef HAVE_LZO
+		"[-y] "
 #endif
-		"[-s feet]\n"
-		"\t%s [-T date] "
 #ifdef HAVE_ZLIB
 		"[-z zlevel] "
 #endif
@@ -1210,40 +1224,66 @@ obsolete(int *argcp, char **argvp[])
 }
 
 /*
- * This tests whether an inode is in the exclude list
+ * This tests whether an inode is in the exclude bitmap
  */
 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;
+	/* if the inode exclude bitmap exists and covers given inode */
+	if (iexclude_bitmap && iexclude_bitmap_bytes > ino / 8) {
+		/* then check this inode against it */
+		int idx = iexclude_bitmap[ino / 8];
+		if (idx & (1 << (ino % 8)))
+			return 1;
 	}
 	return 0;
 }
 
 /*
- * This tests adds an inode to the exclusion list if it isn't already there
+ * This adds an inode to the exclusion bitmap 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 (exclude_ino(ino))
+		return;
+
+	if (vflag) {
 		if (reason)
-			msg("Excluding inode %u (%s) from dump\n", 
-			    ino, reason);
+			msg("Excluding inode %u (%s) from dump\n", ino, reason);
 		else
 			msg("Excluding inode %u from dump\n", ino);
-		iexclude_list[iexclude_num++] = ino;
 	}
+
+	/* check for enough mem; initialize */
+	if ((ino/8 + 1) > iexclude_bitmap_bytes) {
+		if (iexclude_bitmap_bytes == 0) {
+			iexclude_bitmap_bytes = 2 * (ino/8 + 1);
+			iexclude_bitmap = (char*) malloc(iexclude_bitmap_bytes);
+			if (iexclude_bitmap == NULL) {
+				msg("allocating memory failed\n");
+				exit(X_STARTUP);
+			}
+			int j;
+			for (j = 0; j < iexclude_bitmap_bytes; j++)
+				iexclude_bitmap[j] = 0;
+		}
+		else {
+			int oldsize = iexclude_bitmap_bytes;
+			iexclude_bitmap_bytes *= 
+				(ino / 8 + 1) / iexclude_bitmap_bytes + 1;
+			iexclude_bitmap = (char*) realloc(iexclude_bitmap, 
+				iexclude_bitmap_bytes);
+			if (iexclude_bitmap == NULL) {
+				msg("allocating memory failed\n");
+				exit(X_STARTUP);
+			}
+			for( ; oldsize < iexclude_bitmap_bytes; oldsize++)
+				iexclude_bitmap[oldsize] = 0;
+		}
+	}
+		
+	iexclude_bitmap[ino / 8] |= 1 << (ino % 8);
 }
 
 static void