X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fdump.h;h=fafd4c399552a859ce519fe139727d082b33849d;hp=e719f4388dc83941a036c282a1a7b56243cf10e0;hb=6a33575a2c995103764f9c2a1b73ed5e062a60c8;hpb=e1abc9ce25132eef1239047a071c2c1d4822dd9f

diff --git a/dump/dump.h b/dump/dump.h
index e719f43..fafd4c3 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.44 2003/03/30 15:40:35 stelian Exp $
+ *	$Id: dump.h,v 1.49 2004/07/01 09:14:49 stelian Exp $
  */
 
 /*-
@@ -42,7 +42,8 @@
 #include <compatlfs.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,11 +72,11 @@ 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	bzipflag;	/* compression is done using bzlib */
+extern int	zipflag;	/* which compression method */
 extern int	uflag;		/* update flag */
 extern int	mflag;		/* dump metadata only if possible flag */
 extern int	Mflag;		/* multi-volume flag */
@@ -155,8 +156,8 @@ int	maponefile __P((dump_ino_t maxino, long *tapesize, char *directory));
 int	mapdirs __P((dump_ino_t maxino, 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 +169,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 +227,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 +264,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 +287,3 @@ extern off_t lseek();
 extern const char *strerror();
 #endif
 
-				/* 04-Feb-00 ILC */
-#define IEXCLUDE_MAXNUM 256	/* max size of inode exclude list */
-