X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fdump.h;h=1c3c42572a663995eef30aae52daddac4e9091ec;hb=67793be06d93a6c433acaf6a3c7063d203acf583;hp=177329bbc5917b3bddf08637cfbc901d8f6b9deb;hpb=0cedbda5e645e6a30ef47fa3e0fae683160d4431;p=dump.git diff --git a/dump/dump.h b/dump/dump.h index 177329b..1c3c425 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.37 2002/04/04 08:20:23 stelian Exp $ + * $Id: dump.h,v 1.46 2003/05/12 14:16:39 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 #include +#include #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, int 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 + +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(); @@ -285,6 +277,3 @@ extern off_t lseek(); extern const char *strerror(); #endif - /* 04-Feb-00 ILC */ -#define IEXCLUDE_MAXNUM 256 /* max size of inode exclude list */ -