* 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 <stelian@popies.net>, 1999-2000
+ * Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
*/
/*
* 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.
*
#ifndef lint
static const char rcsid[] =
- "$Id: interactive.c,v 1.9 2000/02/26 01:35:48 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>
#ifdef __linux__
#include <ext2fs/ext2fs.h>
+#endif
+
+#if defined(__linux__) || defined(sunos)
extern char * __progname;
#endif
#include "restore.h"
#include "extern.h"
+#if HAVE_READLINE
+#include <readline/readline.h>
+#include <readline/history.h>
+
+static char *rl_gets (char *prompt);
+static void initialize_readline(void);
+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))
/*
* 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 */
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];
char cmd[BUFSIZ];
+#if HAVE_READLINE
+ initialize_readline();
+#endif
arglist.freeglob = 0;
arglist.argcnt = 0;
arglist.glob.gl_flags = GLOB_ALTDIRFUNC;
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) {
goto bad;
createfiles();
createlinks();
- setdirmodes(0);
+ setdirmodes(oflag ? FORCE : 0);
if (dflag)
checkrestore();
volno = 0;
if (strncmp(cmd, "what", strlen(cmd)) != 0)
goto bad;
printdumpinfo();
+ printvolinfo();
break;
/*
* Turn on debugging.
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 */
/*
* Read a command line and trim off trailing white space.
*/
+#if HAVE_READLINE
+ snprintf(input, BUFSIZ, "%s\n", rl_gets(curdir));
+#else
do {
if (pflag)
fprintf(stderr, "%s:%s:%s > ",
(void) strcpy(cmd, "quit");
return;
}
+#endif
for (cp = &input[strlen(input) - 2]; *cp == ' ' || *cp == '\t'; cp--)
/* trim off trailing white space and newline */;
*++cp = '\0';
static char *
copynext(char *input, char *output)
{
- register char *cp, *bp;
+ char *cp, *bp;
char quote;
for (cp = input; *cp == ' ' || *cp == '\t'; cp++)
*/
quote = *cp++;
while (*cp != quote && *cp != '\0')
- *bp++ = *cp++ | 0200;
+ *bp++ = *cp++;
if (*cp++ == '\0') {
fprintf(stderr, "missing %c\n", quote);
cp--;
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, "");
(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);
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;
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);
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)
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;
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;
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))
* respond to interrupts
*/
void
-onintr(int signo)
+onintr(UNUSED(int signo))
{
int save_errno = errno;
exit(1);
errno = save_errno;
}
+
+
+#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;
+
+static char completion_curdir[MAXPATHLEN];
+
+static char *commands[] = {
+ "add ", "cd ", "delete ", "extract ", "help ",
+ "? ", "ls ", "pwd ", "prompt ", "quit ", "xit ",
+ "verbose ", "setmodes ", "what ", "Debug ",
+ NULL };
+
+static char *files = NULL;
+
+static char *
+rl_gets (char *dir)
+{
+ char *prompt;
+ int sz;
+
+ snprintf(completion_curdir, MAXPATHLEN, "%s", dir);
+ completion_curdir[MAXPATHLEN - 1] = '\0';
+
+ if (pflag) {
+ sz = 6 + strlen(__progname) + strlen(spcl.c_filesys) + strlen((completion_curdir + 1 ? completion_curdir + 1 : "/"));
+ prompt = (char *)malloc(sz);
+ if (!prompt)
+ return NULL;
+ snprintf(prompt, sz, "%s:%s:%s > ",
+ __progname,
+ spcl.c_filesys,
+ (completion_curdir + 1 ? completion_curdir + 1 : "/"));
+ }
+ else {
+ sz = 4 + strlen(__progname);
+ prompt = (char *)malloc(sz);
+ if (!prompt)
+ return NULL;
+ snprintf(prompt, sz, "%s > ", __progname);
+ }
+ prompt[sz - 1] = '\0';
+
+ if (line_read) {
+ free (line_read);
+ line_read = (char *)NULL;
+ }
+
+ do {
+ line_read = readline (prompt);
+ } while (line_read && !*line_read);
+
+ free(prompt);
+
+ if (!line_read) {
+ printf("\n");
+ return strdup("quit");
+ }
+
+ add_history (line_read);
+
+ return (line_read);
+}
+
+static char *
+command_generator(const char *text, int state)
+{
+ static int list_index, len;
+ char *name;
+
+ if (!state) {
+ list_index = 0;
+ len = strlen(text);
+ }
+
+ while ( (name = commands[list_index]) != NULL) {
+
+ list_index ++;
+
+ if (strncmp(name, text, len) == 0)
+ return strdup(name);
+ }
+
+ return NULL;
+}
+
+static char *
+filename_generator(const char *text, int state)
+{
+ static int list_index;
+ char *name;
+ RST_DIR *dirp;
+ struct direct *dp;
+ static int entries;
+ char pname[MAXPATHLEN];
+ char fname[MAXPATHLEN];
+ char *slash;
+ char ppname[MAXPATHLEN];
+
+ if (!state) {
+ list_index = 0;
+
+ if (files != NULL) {
+ free(files);
+ entries = 0;
+ files = NULL;
+ }
+ if ((slash = strrchr(text, '/')) != NULL) {
+ int idx = slash - text;
+ if (idx > MAXPATHLEN - 2)
+ idx = MAXPATHLEN - 2;
+ strncpy(ppname, text, MAXPATHLEN);
+ ppname[MAXPATHLEN - 1] = '\0';
+ ppname[idx] = '\0';
+ if (text[0] == '/')
+ snprintf(pname, MAXPATHLEN, ".%s", ppname);
+ else
+ snprintf(pname, MAXPATHLEN, "%s/%s", completion_curdir, ppname);
+ strncpy(fname, ppname + idx + 1, MAXPATHLEN);
+ ppname[idx] = '/';
+ ppname[idx + 1] = '\0';
+ }
+ else {
+ strncpy(pname, completion_curdir, MAXPATHLEN);
+ strncpy(fname, text, MAXPATHLEN);
+ ppname[0] = '\0';
+ }
+ pname[MAXPATHLEN - 1] = '\0';
+ fname[MAXPATHLEN - 1] = '\0';
+ if ((dirp = rst_opendir(pname)) == NULL)
+ return NULL;
+ entries = 0;
+ while ((dp = rst_readdir(dirp)))
+ entries++;
+ rst_closedir(dirp);
+ files = (char *)malloc(entries * MAXPATHLEN);
+ if (files == NULL) {
+ fprintf(stderr, "Out of memory\n");
+ entries = 0;
+ return NULL;
+ }
+ if ((dirp = rst_opendir(pname)) == NULL)
+ panic("directory reopen failed\n");
+ entries = 0;
+ while ((dp = rst_readdir(dirp))) {
+ if (TSTINO(dp->d_ino, dumpmap) == 0)
+ continue;
+ if (strcmp(dp->d_name, ".") == 0 ||
+ strcmp(dp->d_name, "..") == 0)
+ continue;
+ if (strncmp(dp->d_name, fname, strlen(fname)) == 0) {
+ if (inodetype(dp->d_ino) == NODE)
+ snprintf(files + entries * MAXPATHLEN, MAXPATHLEN, "%s%s/", ppname, dp->d_name);
+ else
+ snprintf(files + entries * MAXPATHLEN, MAXPATHLEN, "%s%s ", ppname, dp->d_name);
+ *(files + (entries + 1) * MAXPATHLEN - 1) = '\0';
+ ++entries;
+ }
+ }
+ rst_closedir(dirp);
+ }
+
+ if (list_index >= entries)
+ return NULL;
+
+ name = strdup(files + list_index * MAXPATHLEN);
+ list_index ++;
+
+ 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 */
git.wh0rd.org / dump.git / blobdiff