* 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@noos.fr>, 1999-2000
- * Stelian Pop <pop@noos.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
*/
/*-
#ifndef lint
static const char rcsid[] =
- "$Id: optr.c,v 1.25 2001/07/18 09:12:05 stelian Exp $";
+ "$Id: optr.c,v 1.29 2002/01/16 09:32:14 stelian Exp $";
#endif /* not lint */
#include <config.h>
#include <ext2fs/ext2fs.h>
#include <bsdcompat.h>
#include <signal.h>
-#include <time.h>
#endif
#include "dump.h"
FILE *mytty;
time_t firstprompt, when_answered;
+ if (qflag) {
+ msg("%s - forced abort\n", question);
+ dumpabort(0);
+ /* NOTREACHED */
+ }
+
firstprompt = time(NULL);
if ((mytty = fopen(_PATH_TTY, "r")) == NULL)
for (pf = table; pf != NULL; pf = pf->pf_next) {
fs = pf->pf_fstab;
if (strlen(fs->fs_file) > size &&
- strlen(key) > strlen(fs->fs_file) + 1 &&
+ strlen(key) > strlen(fs->fs_file) &&
strncmp(fs->fs_file, key, strlen(fs->fs_file)) == 0 &&
(key[strlen(fs->fs_file)] == '/' ||
fs->fs_file[strlen(fs->fs_file) - 1] == '/')) {