X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fmain.c;h=20c2ad2be442db2d05413af784d9f88441503653;hp=b73a7887012475bfdd86f4953e5c0110679f59cb;hb=HEAD;hpb=97be3358a32b246d4336692ebad4b1c366446932

diff --git a/dump/main.c b/dump/main.c
index b73a788..20c2ad2 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.94 2004/07/05 15:12:45 stelian Exp $";
+	"$Id: main.c,v 1.99 2011/06/10 13:41:41 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -84,6 +84,9 @@ static const char rcsid[] =
 #include "pathnames.h"
 #include "bylabel.h"
 
+#include "transformation.h"
+#include "indexer.h"
+
 #ifndef SBOFF
 #define SBOFF (SBLOCK * DEV_BSIZE)
 #endif
@@ -123,7 +126,7 @@ 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 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 */
@@ -149,13 +152,6 @@ int	dev_bshift;	/* log2(dev_bsize) */
 int	tp_bshift;	/* log2(TP_BSIZE) */
 dump_ino_t volinfo[TP_NINOS];/* which inode on which volume archive info */
 
-#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 */
@@ -178,6 +174,7 @@ 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 */
+Transformation *transformation = &transformation_null;
 
 long smtc_errno;
 
@@ -197,6 +194,8 @@ static void incompat_flags __P((int, char, char));
 static char* iexclude_bitmap = NULL;		/* the inode exclude bitmap */
 static unsigned int iexclude_bitmap_bytes = 0;	/* size of bitmap in bytes */
 
+Indexer *indexer = &indexer_legacy;
+
 int
 main(int argc, char *argv[])
 {
@@ -239,16 +238,15 @@ main(int argc, char *argv[])
 		quit("TP_BSIZE must be a multiple of DEV_BSIZE\n");
 	memset(&lastlevel, 0, NUM_STR_SIZE);
 	memset(&level, 0, NUM_STR_SIZE);
+	transformation = &transformation_null;
+	/* Default dump level is zero. */
+	level[0] = '0';
 
 	if (argc < 2)
 		usage();
 
 	obsolete(&argc, &argv);
 
-#ifdef USE_QFA
-	gTapeposfd = -1;
-#endif /* USE_QFA */
-
 	while ((ch = getopt(argc, argv,
 			    "0123456789A:aB:b:cd:D:e:E:f:F:h:I:"
 #ifdef HAVE_BZLIB
@@ -357,6 +355,7 @@ main(int argc, char *argv[])
 		case 'j':
 			compressed = 2;
 			zipflag = COMPRESS_BZLIB;
+			transformation = transformation_bzlib_factory(1, 2);
 			if (optarg)
 				compressed = numarg("compress level", 1L, 9L);
 			break;
@@ -408,7 +407,7 @@ main(int argc, char *argv[])
 
 #ifdef USE_QFA
 		case 'Q':		/* create tapeposfile */
-			gTapeposfile = optarg;
+			//gTapeposfile = optarg;  // FIXME - communicate filename to indexer.
 			tapepos = 1;
 			break;
 #endif /* USE_QFA */
@@ -448,6 +447,7 @@ main(int argc, char *argv[])
 #ifdef HAVE_LZO
 		case 'y':
                 	compressed = 2;
+        			transformation = transformation_lzo_factory(1);
 			zipflag = COMPRESS_LZO;
 			break;
 #endif /* HAVE_LZO */
@@ -455,6 +455,7 @@ main(int argc, char *argv[])
 #ifdef HAVE_ZLIB
 		case 'z':
 			compressed = 2;
+			transformation = transformation_zlib_factory(1, 2);
 			zipflag = COMPRESS_ZLIB;
 			if (optarg)
 				compressed = numarg("compress level", 1L, 9L);
@@ -541,7 +542,7 @@ main(int argc, char *argv[])
 	}
 
 	(void)setuid(getuid()); /* rmthost() is the only reason to be setuid */
-	if (Apath && (Afile = open(Apath, O_WRONLY|O_CREAT|O_TRUNC,
+	if (Apath && (Afile = OPEN(Apath, O_WRONLY|O_CREAT|O_TRUNC,
 				   S_IRUSR | S_IWUSR | S_IRGRP |
 				   S_IWGRP | S_IROTH | S_IWOTH)) < 0) {
 		msg("Cannot open %s for writing: %s\n",
@@ -690,9 +691,6 @@ main(int argc, char *argv[])
 
 		msg("Date of this level %s dump: %s", level,
 		    ctime4(&spcl.c_date));
-#ifdef USE_QFA
-		gThisDumpDate = spcl.c_date;
-#endif
 		if (spcl.c_ddate)
 	 		msg("Date of last level %s dump: %s", lastlevel,
 			    ctime4(&spcl.c_ddate));
@@ -791,7 +789,7 @@ main(int argc, char *argv[])
 			if (zipflag == COMPRESS_LZO) 
 				msg("Compressing output (lzo)\n");
 			else
-				msg("Compressing output at compression level %d (%s)\n", 
+				msg("Compressing output at transformation level %d (%s)\n",
 					compressed, zipflag == COMPRESS_ZLIB ? "zlib" : "bzlib");
 		}
 	}
@@ -867,12 +865,12 @@ main(int argc, char *argv[])
 
 	if (pipeout || unlimited) {
 		tapesize += 1 + ntrec;	/* 1 map header + trailer blocks */
-		msg("estimated %ld blocks.\n", tapesize);
+		msg("estimated %lld blocks.\n", tapesize);
 	} else {
 		double fetapes;
 
 		if (blocksperfiles) {
-			long tapesize_left;
+			long long tapesize_left;
 
 			tapesize_left = tapesize;
 			fetapes = 0;
@@ -919,27 +917,12 @@ main(int argc, char *argv[])
 		tapesize += (etapes - 1) *
 			(howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
 		tapesize += etapes + ntrec;	/* headers + trailer blks */
-		msg("estimated %ld blocks on %3.2f tape(s).\n",
+		msg("estimated %lld blocks on %3.2f tape(s).\n",
 		    tapesize, fetapes);
 	}
 
 #ifdef USE_QFA
-	if (tapepos) {
-		msg("writing QFA positions to %s\n", gTapeposfile);
-		if ((gTapeposfd = open(gTapeposfile,
-				       O_WRONLY|O_CREAT|O_TRUNC,
-				       S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
-				       | S_IROTH | S_IWOTH)) < 0)
-			quit("can't open tapeposfile\n");
-		/* 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)) != (ssize_t)strlen(gTps))
-			quit("can't write tapeposfile\n");
-		sprintf(gTps, "ino\ttapeno\ttapepos\n");
-		if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps))
-			quit("can't write tapeposfile\n");
-	}
+	indexer->openQfa();
 #endif /* USE_QFA */
 
 	/*
@@ -1014,6 +997,8 @@ main(int argc, char *argv[])
 	tend_writing = time(NULL);
 	spcl.c_type = TS_END;
 
+	indexer->foo();
+
 	if (Afile >= 0) {
 		volinfo[1] = ROOTINO;
 		memcpy(spcl.c_inos, volinfo, TP_NINOS * sizeof(dump_ino_t));
@@ -1060,8 +1045,8 @@ main(int argc, char *argv[])
 			spcl.c_tapea, tapekb, rate);
 	}
 
-	if (Afile >= 0)
-		msg("Archiving dump to %s\n", Apath);
+	indexer->close();
+	indexer->closeQfa();
 
 	broadcast("DUMP IS DONE!\7\7\n");
 	msg("DUMP IS DONE\n");