Andreas Dilger fixes (CPP, ext2 features, const char etc).

[dump.git] / dump / dump.h

diff --git a/dump/dump.h b/dump/dump.h
index 3eea35a7b276796aee999bebd22972e7da81d656..4e3fadaa50c0e3f9705482b16964982a08408956 100644 (file)
--- 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.21 2001/03/19 13:22:48 stelian Exp $
  */
 
 /*-
@@ -40,6 +41,8 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #define MAXINOPB       (MAXBSIZE / sizeof(struct dinode))
 #define MAXNINDIR      (MAXBSIZE / sizeof(daddr_t))
 
@@ -63,7 +66,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*/
@@ -84,7 +87,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 */
@@ -122,7 +127,7 @@ time_t      unctime __P((const char *str));
 
 /* mapping rouintes */
 struct dinode;
-long   blockest __P((struct dinode *dp));
+long   blockest __P((struct dinode const *dp));
 int    mapfiles __P((ino_t maxino, long *tapesize));
 #ifdef __linux__
 int    mapfilesfromdir __P((ino_t maxino, long *tapesize, char *directory));
@@ -146,12 +151,13 @@ 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));
+const char *rawname __P((const char *cp));
 struct dinode *getino __P((ino_t inum));
 
 /* rdump routines */
@@ -194,6 +200,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;
 };