X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Fmain.c;h=3feca826338866a97364a94d7555baa6538e1624;hp=8b6b08e0a57b7b4cad9ccf47698771a284e26749;hb=e46507f206f7adcb8d2e218963d2115236e86604;hpb=b8f7cbe65e70f2ec792c447995ba00ca360ec0c9 diff --git a/restore/main.c b/restore/main.c index 8b6b08e..3feca82 100644 --- a/restore/main.c +++ b/restore/main.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.26 2001/07/18 13:12:33 stelian Exp $"; + "$Id: main.c,v 1.28 2001/08/14 13:11:58 stelian Exp $"; #endif /* not lint */ #include @@ -81,7 +81,7 @@ static const char rcsid[] = #include "extern.h" int bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0; -int hflag = 1, mflag = 1, Nflag = 0, zflag = 0; +int hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, zflag = 0; int uflag = 0; int dokerberos = 0; char command = '\0'; @@ -101,6 +101,14 @@ char filesys[NAMELEN]; static const char *stdin_opt = NULL; char *bot_script = NULL; +#ifdef USE_QFA +FILE *gTapeposfp; +char *gTapeposfile; +char gTps[255]; +long gSeekstart; +int tapeposflag; +#endif /* USE_QFA */ + #ifdef __linux__ char *__progname; #endif @@ -269,7 +277,19 @@ main(int argc, char *argv[]) atexit(cleanup); - setinput(inputdev); + if (command == 'C' && inputdev[0] != '/') { + /* since we chdir into the directory we are comparing + * to, we must retain the full tape path */ + char wd[MAXPATHLEN], fullpathinput[MAXPATHLEN]; + if (!getcwd(wd, MAXPATHLEN)) + err(1, "can't get current directory"); + snprintf(fullpathinput, MAXPATHLEN, "%s/%s", wd, inputdev); + fullpathinput[MAXPATHLEN - 1] = '\0'; +printf("FULLPATH is %s\n", fullpathinput); + setinput(fullpathinput); + } + else + setinput(inputdev); if (argc == 0 && !filelist) { argc = 1;