X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fdump.h;h=e525f3dfcc0fc648ecfe263a75bfd2634dc07461;hp=8fb157a32a06d292b62b810cbb87f9ad2ecc51f0;hb=e3956dfb7715a21919aa66dd4209a2dc1c3c82da;hpb=206f768c7a7a4bca1c4acc3c686d55578c0cb919

diff --git a/dump/dump.h b/dump/dump.h
index 8fb157a..e525f3d 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.45 2003/03/31 09:42:58 stelian Exp $
+ *	$Id: dump.h,v 1.51 2011/06/10 13:07:29 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,8 +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 char	lastlevel[NUM_STR_SIZE];/* dump level of previous dump */
+extern char	level[NUM_STR_SIZE];/* dump level of this dump */
 extern int	Afile;		/* archive file descriptor */
 extern int      AfileActive;    /* Afile flag */
 extern int	zipflag;	/* which compression method */
@@ -90,7 +92,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,6 +117,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 */
+extern Transformation *transformation;
 
 #ifdef USE_QFA
 #define	QFA_MAGIC	"495115637697"
@@ -147,16 +150,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 +171,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 +229,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 {
@@ -263,6 +266,15 @@ extern int errno;
 int dump_fs_open(const char *disk, ext2_filsys *fs);
 #endif
 
+#ifndef	__linux__
+#ifndef	_PATH_UTMP
+#define	_PATH_UTMP	"/etc/utmp"
+#endif
+#ifndef	_PATH_FSTAB
+#define	_PATH_FSTAB	"/etc/fstab"
+#endif
+#endif
+
 #ifdef sunos
 extern char *calloc();
 extern char *malloc();
@@ -277,6 +289,3 @@ extern off_t lseek();
 extern const char *strerror();
 #endif
 
-				/* 04-Feb-00 ILC */
-#define IEXCLUDE_MAXNUM 256	/* max size of inode exclude list */
-