X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Frestore.h;h=480f4d028ffdc068b75dd566949f7dd393322316;hb=c38e5b6a9c658f06d9b27f33e9db131ffa23d947;hp=1cef2d90e4bc6385a08d98968d598d770cc0aa56;hpb=1227625a12a66e0ded78a1997c2d23f23202a382;p=dump.git

diff --git a/restore/restore.h b/restore/restore.h
index 1cef2d9..480f4d0 100644
--- a/restore/restore.h
+++ b/restore/restore.h
@@ -1,8 +1,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, 1995, 1996
+ *	Remy Card <card@Linux.EU.Org>, 1994-1997
+ *	Stelian Pop <pop@cybercable.fr>, 1999-2000
  *
+ *	$Id: restore.h,v 1.9 2000/05/28 16:52:21 stelian Exp $
  */
 
 /*
@@ -41,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
  */
@@ -53,14 +54,16 @@ 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 */
 extern int	yflag;		/* always try to recover from tape errors */
 /*
  * Global variables
  */
 extern char	*dumpmap; 	/* map of inodes on this dump tape */
-extern char	*usedinomap; 	/* map of inodes to be deleted */
+extern char	*usedinomap; 	/* map of inodes that are in use on this fs */
 extern ino_t	maxino;		/* highest numbered inode in this file system */
 extern long	dumpnum;	/* location of the dump on this tape */
 extern long	volno;		/* current volume being read */
@@ -69,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
@@ -149,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