X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fdump.h;h=8235858b0bc916b4ee03dbecb9c91a84381d2abe;hb=35b24fb7fabcf6df3b37aebf70c228d5b0688d32;hp=3eea35a7b276796aee999bebd22972e7da81d656;hpb=0d7af9c5f2cc7d4a97e934692ea8665e09fd5500;p=dump.git

diff --git a/dump/dump.h b/dump/dump.h
index 3eea35a..8235858 100644
--- a/dump/dump.h
+++ b/dump/dump.h
@@ -2,9 +2,10 @@
  *	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-2000
+ *	Stelian Pop <pop@noos.fr>, 1999-2000
+ *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  *
- *	$Id: dump.h,v 1.13 2000/03/02 11:34:51 stelian Exp $
+ *	$Id: dump.h,v 1.23 2001/04/10 12:46:53 stelian Exp $
  */
 
 /*-
@@ -40,6 +41,9 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
+#include <protocols/dumprestore.h>
+
 #define MAXINOPB	(MAXBSIZE / sizeof(struct dinode))
 #define MAXNINDIR	(MAXBSIZE / sizeof(daddr_t))
 
@@ -63,7 +67,7 @@ char	*dumpinomap;	/* map of files to be dumped */
 /*
  *	All calculations done in 0.1" units!
  */
-char	*disk;		/* name of the disk file */
+const char *disk;		/* name of the disk file */
 char	tape[MAXPATHLEN];	/* name of the tape file */
 char	*tapeprefix;	/* prefix of the tape file */
 char	*dumpdates;	/* name of the file containing dump date information*/
@@ -75,7 +79,7 @@ char	*eot_script;	/* end of volume script fiag */
 int	diskfd;		/* disk file descriptor */
 int	tapefd;		/* tape file descriptor */
 int	pipeout;	/* true => output to standard output */
-ino_t	curino;		/* current inumber; used globally */
+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 */
@@ -84,7 +88,9 @@ long	asize;		/* number of 0.1" units written on current tape */
 int	etapes;		/* estimated number of tapes */
 int	nonodump;	/* if set, do not honor UF_NODUMP user flags */
 int	unlimited;	/* if set, write to end of medium */
-
+int	compressed;	/* if set, dump is to be compressed */
+long long bytes_written;/* total bytes written to tape */
+long	uncomprblks;	/* uncompressed blocks written to tape */
 int	notify;		/* notify operator flag */
 int	blockswritten;	/* number of blocks written on current tape */
 int	tapeno;		/* current tape number */
@@ -101,6 +107,15 @@ long	dev_bsize;	/* block size of underlying disk device */
 int	dev_bshift;	/* log2(dev_bsize) */
 int	tp_bshift;	/* log2(TP_BSIZE) */
 
+#ifdef USE_QFA
+#define	QFA_MAGIC	"495115637697"
+#define QFA_VERSION	"1.0"
+int	gTapeposfd;
+char	*gTapeposfile;
+char	gTps[255];
+int	GetTapePos __P((long *pos));
+#endif /* USE_QFA */
+
 #ifndef __P
 #include <sys/cdefs.h>
 #endif
@@ -122,22 +137,22 @@ time_t	unctime __P((const char *str));
 
 /* mapping rouintes */
 struct	dinode;
-long	blockest __P((struct dinode *dp));
-int	mapfiles __P((ino_t maxino, long *tapesize));
+long	blockest __P((struct dinode const *dp));
+int	mapfiles __P((dump_ino_t maxino, long *tapesize));
 #ifdef	__linux__
-int	mapfilesfromdir __P((ino_t maxino, long *tapesize, char *directory));
+int	mapfilesfromdir __P((dump_ino_t maxino, long *tapesize, char *directory));
 #endif
-int	mapdirs __P((ino_t maxino, long *tapesize));
+int	mapdirs __P((dump_ino_t maxino, long *tapesize));
 
 /* file dumping routines */
-void	blksout __P((daddr_t *blkp, int frags, ino_t ino));
+void	blksout __P((daddr_t *blkp, int frags, dump_ino_t ino));
 void	bread __P((daddr_t blkno, char *buf, int size));
-void	dumpino __P((struct dinode *dp, ino_t ino));
+void	dumpino __P((struct dinode *dp, dump_ino_t ino));
 #ifdef	__linux__
-void	dumpdirino __P((struct dinode *dp, ino_t ino));
+void	dumpdirino __P((struct dinode *dp, dump_ino_t ino));
 #endif
-void	dumpmap __P((char *map, int type, ino_t ino));
-void	writeheader __P((ino_t ino));
+void	dumpmap __P((char *map, int type, dump_ino_t ino));
+void	writeheader __P((dump_ino_t ino));
 
 /* tape writing routines */
 int	alloctape __P((void));
@@ -146,13 +161,14 @@ void	dumpblock __P((daddr_t blkno, int size));
 void	startnewtape __P((int top));
 time_t	trewind __P((void));
 void	writerec __P((const void *dp, int isspcl));
+char	*mktimeest __P((time_t tnow));
 
 void 	Exit __P((int status));
 void	dumpabort __P((int signo));
 void	getfstab __P((void));
 
-char	*rawname __P((char *cp));
-struct	dinode *getino __P((ino_t inum));
+const char *rawname __P((const char *cp));
+struct	dinode *getino __P((dump_ino_t inum));
 
 /* rdump routines */
 #ifdef RDUMP
@@ -194,6 +210,7 @@ struct	fstab *fstabsearchdir __P((const char *key, char *dir));	/* search fs_fil
  */
 struct dumpdates {
 	char	dd_name[MAXPATHLEN+3];
+	struct fstab *dd_fstab;
 	char	dd_level;
 	time_t	dd_ddate;
 };