X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fdump.h;h=fafd4c399552a859ce519fe139727d082b33849d;hp=e6d8e138b9059fc774b719a96cea51764b8ca232;hb=03dbfe054895f3654586eb1563f6baf4dd893890;hpb=fceb4f25728fd34fabfad406c32c5d8c142aae90 diff --git a/dump/dump.h b/dump/dump.h index e6d8e13..fafd4c3 100644 --- a/dump/dump.h +++ b/dump/dump.h @@ -5,7 +5,7 @@ * Stelian Pop , 1999-2000 * Stelian Pop - Alcôve , 2000-2002 * - * $Id: dump.h,v 1.39 2002/06/05 13:29:15 stelian Exp $ + * $Id: dump.h,v 1.49 2004/07/01 09:14:49 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,9 +39,11 @@ #include #include +#include #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. @@ -74,10 +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 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 */ @@ -157,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)); @@ -170,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)); @@ -186,11 +185,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 */ @@ -214,9 +213,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 + +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 /* @@ -225,8 +226,8 @@ 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; + struct mntent *dd_fstab; + int dd_level; time_t dd_ddate; }; struct dumptime { @@ -286,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 */ -