X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fdump.h;h=1e3866e6bcc3ef0a8a7c2cb047abae9adbb28c32;hp=5b052c8a592a4d65e810325119e58678b2366808;hb=70deb804d2211535f1f188a14e8fc867db9c6625;hpb=d1925e0c515fcb4f815d75292566d600fd715ff5

diff --git a/dump/dump.h b/dump/dump.h
index 5b052c8..1e3866e 100644
--- a/dump/dump.h
+++ b/dump/dump.h
@@ -5,7 +5,7 @@
  *	Stelian Pop <stelian@popies.net>, 1999-2000
  *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
- *	$Id: dump.h,v 1.47 2003/10/26 16:05:46 stelian Exp $
+ *	$Id: dump.h,v 1.52 2011/06/10 13:41:41 stelian Exp $
  */
 
 /*-
@@ -40,9 +40,11 @@
 #include <config.h>
 #include <protocols/dumprestore.h>
 #include <compatlfs.h>
+#include "transformation.h"
 
 #define MAXINOPB	(MAXBSIZE / sizeof(struct dinode))
-#define MAXNINDIR	(MAXBSIZE / sizeof(daddr_t))
+#define MAXNINDIR	(MAXBSIZE / sizeof(blk_t))
+#define NUM_STR_SIZE	32	/* a generic number buffer size */
 
 /*
  * Dump maps used to describe what is to be dumped.
@@ -71,10 +73,8 @@ extern const char *disk;	/* name of the disk file */
 extern char	tape[MAXPATHLEN];/* name of the tape file */
 extern char	*tapeprefix;	/* prefix of the tape file */
 extern char	*dumpdates;	/* name of the file containing dump date information*/
-extern char	lastlevel;	/* dump level of previous dump */
-extern char	level;		/* dump level of this dump */
-extern int	Afile;		/* archive file descriptor */
-extern int      AfileActive;    /* Afile flag */
+extern char	lastlevel[NUM_STR_SIZE];/* dump level of previous dump */
+extern char	level[NUM_STR_SIZE];/* dump level of this dump */
 extern int	zipflag;	/* which compression method */
 extern int	uflag;		/* update flag */
 extern int	mflag;		/* dump metadata only if possible flag */
@@ -90,7 +90,7 @@ extern int	fifoout;	/* true => output to fifo */
 extern dump_ino_t curino;	/* current inumber; used globally */
 extern int	newtape;	/* new tape flag */
 extern int	density;	/* density in 0.1" units */
-extern long	tapesize;	/* estimated tape size, blocks */
+extern long long tapesize;	/* estimated tape size, blocks */
 extern long	tsize;		/* tape size in 0.1" units */
 extern long	asize;		/* number of 0.1" units written on current tape */
 extern int	etapes;		/* estimated number of tapes */
@@ -115,15 +115,7 @@ extern long	dev_bsize;	/* block size of underlying disk device */
 extern int	dev_bshift;	/* log2(dev_bsize) */
 extern int	tp_bshift;	/* log2(TP_BSIZE) */
 extern dump_ino_t volinfo[];	/* which inode on which volume archive info */
-
-#ifdef USE_QFA
-#define	QFA_MAGIC	"495115637697"
-#define QFA_VERSION	"1.0"
-extern int	gTapeposfd;
-extern char	*gTapeposfile;
-extern char	gTps[255];
-extern int32_t	gThisDumpDate;
-#endif /* USE_QFA */
+extern Transformation *transformation;
 
 #ifndef __P
 #include <sys/cdefs.h>
@@ -147,16 +139,16 @@ time_t	unctime __P((const char *str));
 /* mapping rouintes */
 struct	dinode;
 long	blockest __P((struct dinode const *dp));
-int	mapfiles __P((dump_ino_t maxino, long *tapesize));
+int	mapfiles __P((dump_ino_t maxino, long long *tapesize));
 #ifdef	__linux__
-int	mapfilesfromdir __P((dump_ino_t maxino, long *tapesize, char *directory));
-int	maponefile __P((dump_ino_t maxino, long *tapesize, char *directory));
+int	mapfilesfromdir __P((dump_ino_t maxino, long long *tapesize, char *directory));
+int	maponefile __P((dump_ino_t maxino, long long *tapesize, char *directory));
 #endif
-int	mapdirs __P((dump_ino_t maxino, long *tapesize));
+int	mapdirs __P((dump_ino_t maxino, long long *tapesize));
 
 /* file dumping routines */
-void	blksout __P((daddr_t *blkp, int frags, dump_ino_t ino));
-void	bread __P((daddr_t blkno, char *buf, int size));
+void	blksout __P((blk_t *blkp, int frags, dump_ino_t ino));
+void	bread __P((ext2_loff_t blkno, char *buf, int size));
 void	dumpino __P((struct dinode *dp, dump_ino_t ino, int metaonly));
 #ifdef	__linux__
 void	dumpdirino __P((struct dinode *dp, dump_ino_t ino));
@@ -168,7 +160,7 @@ void	mkchecksum __P((union u_spcl *tmpspcl));
 /* tape writing routines */
 int	alloctape __P((void));
 void	close_rewind __P((void));
-void	dumpblock __P((daddr_t blkno, int size));
+void	dumpblock __P((blk_t blkno, int size));
 void	startnewtape __P((int top));
 time_t	trewind __P((void));
 void	writerec __P((const void *dp, int isspcl));
@@ -226,7 +218,7 @@ struct	mntent *fstabsearchdir __P((const char *key, char *dir));	/* search fs_fi
 struct dumpdates {
 	char	dd_name[MAXPATHLEN+3];
 	struct mntent *dd_fstab;
-	char	dd_level;
+	int	dd_level;
 	time_t	dd_ddate;
 };
 struct dumptime {
@@ -284,5 +276,6 @@ extern void endgrent();
 extern void exit();
 extern off_t lseek();
 extern const char *strerror();
+
 #endif