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

diff --git a/dump/dump.h b/dump/dump.h
index a392aac..8fb157a 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.38 2002/05/21 15:48:46 stelian Exp $
+ *	$Id: dump.h,v 1.45 2003/03/31 09:42:58 stelian Exp $
  */
 
 /*-
@@ -20,11 +20,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -43,6 +39,7 @@
 
 #include <config.h>
 #include <protocols/dumprestore.h>
+#include <compatlfs.h>
 
 #define MAXINOPB	(MAXBSIZE / sizeof(struct dinode))
 #define MAXNINDIR	(MAXBSIZE / sizeof(daddr_t))
@@ -77,11 +74,13 @@ 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	bzipflag;	/* compression is done using bzlib */
+extern int      AfileActive;    /* Afile flag */
+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 */
 extern int	qflag;		/* quit on errors flag */
+extern int	vflag;		/* verbose flag */
 extern int      breademax;      /* maximum number of bread errors before we quit */
 extern char	*eot_script;	/* end of volume script fiag */
 extern int	diskfd;		/* disk file descriptor */
@@ -185,11 +184,11 @@ struct	dinode *getino __P((dump_ino_t inum));
 /* rdump routines */
 #ifdef RDUMP
 int	rmthost __P((const char *host));
-int	rmtopen __P((const char *tape, const char *mode));
+int	rmtopen __P((const char *tape, const int mode));
 void	rmtclose __P((void));
 int	rmtread __P((char *buf, size_t count));
 int	rmtwrite __P((const char *buf, size_t count));
-int	rmtseek __P((int offset, int pos));
+OFF_T	rmtseek __P((OFF_T offset, int pos));
 struct mtget * rmtstatus __P((void));
 int	rmtioctl __P((int cmd, int count));
 #endif /* RDUMP */
@@ -213,9 +212,11 @@ void	do_exclude_ino __P((dump_ino_t ino, const char *));
 #define DIALUP	"ttyd"			/* prefix for dialups */
 #endif
 
-struct	fstab *fstabsearch __P((const char *key));	/* search fs_file and fs_spec */
+#include <mntent.h>
+
+struct	mntent *fstabsearch __P((const char *key));	/* search fs_file and fs_spec */
 #ifdef	__linux__
-struct	fstab *fstabsearchdir __P((const char *key, char *dir));	/* search fs_file and fs_spec */
+struct	mntent *fstabsearchdir __P((const char *key, char *dir));	/* search fs_file and fs_spec */
 #endif
 
 /*
@@ -224,7 +225,7 @@ struct	fstab *fstabsearchdir __P((const char *key, char *dir));	/* search fs_fil
  */
 struct dumpdates {
 	char	dd_name[MAXPATHLEN+3];
-	struct fstab *dd_fstab;
+	struct mntent *dd_fstab;
 	char	dd_level;
 	time_t	dd_ddate;
 };
@@ -262,15 +263,6 @@ 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();