X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Finteractive.c;h=ecbffda09e8a3dde54e457f666529feb24fa1253;hp=ca7b2e93841d7c4e1fa24cadc5fa6bc3e6af0094;hb=a3ab8e4243d14360f2769230d23e7d3afd6397cb;hpb=0a99352128efc4af44160eee69e8990686bf9ad5

diff --git a/restore/interactive.c b/restore/interactive.c
index ca7b2e9..ecbffda 100644
--- a/restore/interactive.c
+++ b/restore/interactive.c
@@ -2,8 +2,8 @@
  *	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@cybercable.fr> - Alcôve <www.alcove.fr>, 2000
+ *	Stelian Pop <stelian@popies.net>, 1999-2000
+ *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  */
 
 /*
@@ -18,11 +18,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.
  *
@@ -41,18 +37,29 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: interactive.c,v 1.13 2000/11/10 14:42:25 stelian Exp $";
+	"$Id: interactive.c,v 1.27 2003/10/26 16:05:48 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
+#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
 #ifdef	__linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <bsdcompat.h>
 #else	/* __linux__ */
+#ifdef sunos
+#include <sys/fcntl.h>
+#include <bsdcompat.h>
+#else
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
+#endif
 #endif	/* __linux__ */
 #include <protocols/dumprestore.h>
 
@@ -66,6 +73,9 @@ static const char rcsid[] =
 
 #ifdef	__linux__
 #include <ext2fs/ext2fs.h>
+#endif
+
+#if defined(__linux__) || defined(sunos)
 extern char * __progname;
 #endif
 
@@ -78,9 +88,9 @@ extern char * __progname;
 
 static char *rl_gets (char *prompt);
 static void initialize_readline(void);
-static char **restore_completion (char *text, int start, int end);
-static char *command_generator(char *text, int state);
-static char *filename_generator(char *text, int state);
+static char **restore_completion (const char *text, int start, int end);
+static char *command_generator(const char *text, int state);
+static char *filename_generator(const char *text, int state);
 #endif
 
 #define round(a, b) (((a) + (b) - 1) / (b) * (b))
@@ -96,7 +106,7 @@ static int pflag = 0;		/* prompt mode */
  * Structure and routines associated with listing directories.
  */
 struct afile {
-	ino_t	fnum;		/* inode number of file */
+	dump_ino_t fnum;	/* inode number of file */
 	char	*fname;		/* file name */
 	short	len;		/* name length */
 	char	prefix;		/* prefix character */
@@ -124,8 +134,8 @@ static void	 printlist __P((char *, char *));
 void
 runcmdshell(void)
 {
-	register struct entry *np;
-	ino_t ino;
+	struct entry *np;
+	dump_ino_t ino;
 	struct arglist arglist;
 	char curdir[MAXPATHLEN];
 	char name[MAXPATHLEN];
@@ -140,8 +150,8 @@ runcmdshell(void)
 	arglist.glob.gl_opendir = (void *)rst_opendir;
 	arglist.glob.gl_readdir = (void *)glob_readdir;
 	arglist.glob.gl_closedir = (void *)rst_closedir;
-	arglist.glob.gl_lstat = glob_stat;
-	arglist.glob.gl_stat = glob_stat;
+	arglist.glob.gl_lstat = (int (*)(const char *, void *))glob_stat;
+	arglist.glob.gl_stat = (int (*)(const char *, void *))glob_stat;
 	canon("/", curdir, sizeof(curdir));
 loop:
 	if (setjmp(reset) != 0) {
@@ -206,7 +216,7 @@ loop:
 			goto bad;
 		createfiles();
 		createlinks();
-		setdirmodes(0);
+		setdirmodes(oflag ? FORCE : 0);
 		if (dflag)
 			checkrestore();
 		volno = 0;
@@ -311,6 +321,7 @@ loop:
 		if (strncmp(cmd, "what", strlen(cmd)) != 0)
 			goto bad;
 		printdumpinfo();
+		printvolinfo();
 		break;
 	/*
 	 * Turn on debugging.
@@ -351,7 +362,7 @@ loop:
 static void
 getcmd(char *curdir, char *cmd, char *name, int size, struct arglist *ap)
 {
-	register char *cp;
+	char *cp;
 	static char input[BUFSIZ];
 	char output[BUFSIZ];
 #	define rawname input	/* save space by reusing input buffer */
@@ -447,7 +458,7 @@ retnext:
 static char *
 copynext(char *input, char *output)
 {
-	register char *cp, *bp;
+	char *cp, *bp;
 	char quote;
 
 	for (cp = input; *cp == ' ' || *cp == '\t'; cp++)
@@ -496,7 +507,7 @@ copynext(char *input, char *output)
 void
 canon(char *rawname, char *canonname, int len)
 {
-	register char *cp, *np;
+	char *cp, *np;
 
 	if (strcmp(rawname, ".") == 0 || strncmp(rawname, "./", 2) == 0)
 		(void) strcpy(canonname, "");
@@ -504,7 +515,7 @@ canon(char *rawname, char *canonname, int len)
 		(void) strcpy(canonname, ".");
 	else
 		(void) strcpy(canonname, "./");
-	if (strlen(canonname) + strlen(rawname) >= len)
+	if (strlen(canonname) + strlen(rawname) >= (unsigned)len)
 		errx(1, "canonname: not enough buffer space");
 		
 	(void) strcat(canonname, rawname);
@@ -548,8 +559,8 @@ canon(char *rawname, char *canonname, int len)
 static void
 printlist(char *name, char *basename)
 {
-	register struct afile *fp, *list, *listp = NULL;
-	register struct direct *dp;
+	struct afile *fp, *list, *listp = NULL;
+	struct direct *dp;
 	struct afile single;
 	RST_DIR *dirp;
 	int entries, len, namelen;
@@ -564,7 +575,7 @@ printlist(char *name, char *basename)
 		list = &single;
 		mkentry(name, dp, list);
 		len = strlen(basename) + 1;
-		if (strlen(name) - len > single.len) {
+		if (strlen(name) - len > (unsigned)single.len) {
 			freename(single.fname);
 			single.fname = savename(&name[len]);
 			single.len = strlen(single.fname);
@@ -585,7 +596,7 @@ printlist(char *name, char *basename)
 		entries = 0;
 		listp = list;
 		namelen = snprintf(locname, sizeof(locname), "%s/", name);
-		if (namelen >= sizeof(locname))
+		if (namelen >= (int)sizeof(locname))
 			namelen = sizeof(locname) - 1;
 		while ((dp = rst_readdir(dirp))) {
 			if (dp == NULL)
@@ -693,7 +704,7 @@ mkentry(char *name, struct direct *dp, struct afile *fp)
 static void
 formatf(struct afile *list, int nentry)
 {
-	register struct afile *fp, *endlist;
+	struct afile *fp, *endlist;
 	int width, bigino, haveprefix, havepostfix;
 	int i, j, w, precision = 0, columns, lines;
 
@@ -703,7 +714,7 @@ formatf(struct afile *list, int nentry)
 	bigino = ROOTINO;
 	endlist = &list[nentry];
 	for (fp = &list[0]; fp < endlist; fp++) {
-		if (bigino < fp->fnum)
+		if (bigino < (int)fp->fnum)
 			bigino = fp->fnum;
 		if (width < fp->len)
 			width = fp->len;
@@ -790,7 +801,7 @@ glob_readdir(RST_DIR *dirp)
 static int
 glob_stat(const char *name, struct stat *stp)
 {
-	register struct direct *dp;
+	struct direct *dp;
 	dp = pathsearch(name);
 	if (dp == NULL || (!dflag && TSTINO(dp->d_ino, dumpmap) == 0) ||
 	    (!vflag && dp->d_ino == WINO))
@@ -816,7 +827,7 @@ fcmp(const void *f1, const void *f2)
  * respond to interrupts
  */
 void
-onintr(int signo)
+onintr(UNUSED(int signo))
 {
 	int save_errno = errno;
 
@@ -830,6 +841,10 @@ onintr(int signo)
 
 #if HAVE_READLINE
 
+#if !HAVE_READLINE_RLCM
+#define rl_completion_matches completion_matches
+#endif
+
 /* A static variable for holding the line. */
 static char *line_read = NULL;
 
@@ -892,30 +907,8 @@ rl_gets (char *dir)
 	return (line_read);
 }
 
-static void 
-initialize_readline(void) 
-{
-	rl_attempted_completion_function = restore_completion;
-	rl_completion_entry_function = (Function *)NULL;
-	rl_completion_append_character = '\0';
-	rl_instream = terminal;
-}
-
-static char **
-restore_completion (char *text, int start, int end)
-{
-	char **matches;
-
-	if (start == 0)
-		matches = completion_matches (text, command_generator);
-	else
-		matches = completion_matches (text, filename_generator);
-
-	return (matches);
-}
-
 static char *
-command_generator(char *text, int state)
+command_generator(const char *text, int state)
 {
 	static int list_index, len;
 	char *name;
@@ -937,7 +930,7 @@ command_generator(char *text, int state)
 }
 
 static char *
-filename_generator(char *text, int state)
+filename_generator(const char *text, int state)
 {
 	static int list_index;
 	char *name;
@@ -1020,4 +1013,30 @@ filename_generator(char *text, int state)
 
 	return name;
 }
+
+static char **
+restore_completion (const char *text, int start, UNUSED(int end))
+{
+	char **matches;
+
+	if (start == 0)
+		matches = rl_completion_matches (text, command_generator);
+	else
+		matches = rl_completion_matches (text, filename_generator);
+
+	return (matches);
+}
+
+static void 
+initialize_readline(void) 
+{
+	rl_readline_name = "dump";
+	rl_attempted_completion_function = restore_completion;
+	rl_completion_entry_function = NULL;
+#if HAVE_READLINE_CAC	/* compile with readline 2.0 */
+	rl_completion_append_character = '\0';
+#endif
+	rl_instream = terminal;
+}
+
 #endif /* HAVE_READLINE */