Error code to restore when compare errors detected.

[dump.git] / restore / restore.h

diff --git a/restore/restore.h b/restore/restore.h
index dbb97e5c03d7c0266acb3e22568343ddda83d448..480f4d028ffdc068b75dd566949f7dd393322316 100644 (file)
--- a/restore/restore.h
+++ b/restore/restore.h
@@ -2,8 +2,9 @@
  *     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 
+ *     Stelian Pop <pop@cybercable.fr>, 1999-2000
  *
+ *     $Id: restore.h,v 1.9 2000/05/28 16:52:21 stelian Exp $
  */
 
 /*
@@ -42,10 +43,9 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *     @(#)restore.h   8.3 (Berkeley) 9/13/94
  */
 
+#include <protocols/dumprestore.h>
 /*
  * Flags
  */
@@ -54,6 +54,7 @@ extern int    bflag;          /* set input block size */
 extern int     dflag;          /* print out debugging info */
 extern int     hflag;          /* restore heirarchies */
 extern int     mflag;          /* restore by name instead of inode number */
+extern int     Mflag;          /* multi-volume restore */
 extern int     Nflag;          /* do not write the disk */
 extern int     uflag;          /* unlink symlink targets */
 extern int     vflag;          /* print out actions taken */
@@ -71,14 +72,15 @@ extern time_t       dumptime;       /* time that this dump begins */
 extern time_t  dumpdate;       /* time that this dump was made */
 extern char    command;        /* opration being performed */
 extern FILE    *terminal;      /* file descriptor for the terminal input */
+extern char    *tmpdir;        /* name of temp directory */
 extern int     oldinofmt;      /* reading tape with old format inodes */
 extern int     Bcvt;           /* need byte swapping on inodes and dirs */
 extern int     compare_ignore_not_found;
                                /* used to compare incremental dumps, */
                                /* so messages about "not found" files */
                                /* isn't seen. */
-extern char    *filesys;       /* name of dumped filesystem */
-extern char    *tmpdir;        /* name of temp directory */
+extern int     compare_errors; /* did we encounter any compare errors? */
+extern char    filesys[NAMELEN];/* name of dumped filesystem */
 
 /*
  * Each file in the file system is described by one of these entries
@@ -151,8 +153,8 @@ typedef struct rstdirdesc RST_DIR;
 #define        SETINO(ino, map) \
        map[(u_int)((ino) - 1) / NBBY] |=  1 << ((u_int)((ino) - 1) % NBBY)
 
-#define dprintf                if (dflag) fprintf
-#define vprintf                if (vflag) fprintf
+#define Dprintf                if (dflag) fprintf
+#define Vprintf                if (vflag) fprintf
 
 #define GOOD 1
 #define FAIL 0