* 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.
+ *
+ * $Id: main.c,v 1.5 1999/10/11 13:31:13 stelian Exp $
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/4/95";
-#endif
-static const char rcsid[] =
- "$Id: main.c,v 1.2 1999/10/11 12:53:23 stelian Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
#endif /* __linux__ */
#include <protocols/dumprestore.h>
-#include <err.h>
+#include <compaterr.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
time_t dumptime;
time_t dumpdate;
FILE *terminal;
+char *tmpdir;
int compare_ignore_not_found;
char *filesys = NULL;
-char *tmpdir = _PATH_TMP;
#ifdef __linux__
char *__progname;
static void usage __P((void));
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
int ch;
ino_t ino;
- char *inputdev;
+ char *inputdev = _PATH_DEFTAPE;
char *symtbl = "./restoresymtable";
char *p, name[MAXPATHLEN];
if ((inputdev = getenv("TAPE")) == NULL)
inputdev = _PATH_DEFTAPE;
+ if ((tmpdir = getenv("TMPDIR")) == NULL)
+ tmpdir = _PATH_TMP;
+ if ((tmpdir = strdup(tmpdir)) == NULL)
+ err(1, "malloc tmpdir");
+ for (p = tmpdir + strlen(tmpdir) - 1; p >= tmpdir && *p == '/'; p--)
+ ;
obsolete(&argc, &argv);
#ifdef KERBEROS
-#define optlist "b:CcdDf:hikmNRrs:tTuvxy"
+#define optlist "b:CcdD:f:hikmNRrs:tT:uvxy"
#else
-#define optlist "b:CcdDf:himNRrs:tTuvxy"
+#define optlist "b:CcdD:f:himNRrs:tT:uvxy"
#endif
while ((ch = getopt(argc, argv, optlist)) != -1)
switch(ch) {
(void) signal(SIGTERM, SIG_IGN);
setlinebuf(stderr);
+ atexit(cleanup);
+
setinput(inputdev);
if (argc == 0) {
case 'C': {
struct stat stbuf;
- vprintf(stdout, "Begin compare restore\n");
+ Vprintf(stdout, "Begin compare restore\n");
compare_ignore_not_found = 0;
setup();
printf("filesys = %s\n", filesys);
- if (stat(filesys, &stbuf) < 0) {
- fprintf(stderr, "cannot stat directory %s: %s\n",
- filesys, strerror(errno));
- exit(1);
- } else {
- if (chdir(filesys) < 0) {
- fprintf(stderr, "cannot cd to %s: %s\n",
- filesys, strerror(errno));
- exit(1);
- }
- }
+ if (stat(filesys, &stbuf) < 0)
+ err(1, "cannot stat directory %s", filesys);
+ if (chdir(filesys) < 0)
+ err(1, "cannot cd to %s", filesys);
compare_ignore_not_found = dumptime > 0;
initsymtable((char *)0);
extractdirs(0);
/*
* This is an incremental dump tape.
*/
- vprintf(stdout, "Begin incremental restore\n");
+ Vprintf(stdout, "Begin incremental restore\n");
initsymtable(symtbl);
extractdirs(1);
removeoldleaves();
- vprintf(stdout, "Calculate node updates.\n");
+ Vprintf(stdout, "Calculate node updates.\n");
treescan(".", ROOTINO, nodeupdates);
findunreflinks();
removeoldnodes();
/*
* This is a level zero dump tape.
*/
- vprintf(stdout, "Begin level 0 restore\n");
+ Vprintf(stdout, "Begin level 0 restore\n");
initsymtable((char *)0);
extractdirs(1);
- vprintf(stdout, "Calculate extraction list.\n");
+ Vprintf(stdout, "Calculate extraction list.\n");
treescan(".", ROOTINO, nodeupdates);
}
createleaves(symtbl);
setdirmodes(FORCE);
checkrestore();
if (dflag) {
- vprintf(stdout, "Verify the directory structure\n");
+ Vprintf(stdout, "Verify the directory structure\n");
treescan(".", ROOTINO, verifyfile);
}
dumpsymtable(symtbl, (long)1);
checkrestore();
break;
}
- done(0);
+ exit(0);
/* NOTREACHED */
- exit(1); /* gcc shut up */
+ return 0; /* gcc shut up */
}
static void
-usage()
+usage(void)
{
+#ifdef KERBEROS
+#define kerbflag "k"
+#else
+#define kerbflag
+#endif
(void)fprintf(stderr, "usage:\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n",
- "restore -i [-chkmuvy] [-b blocksize] [-f file] [-s fileno]",
- "restore -r [-ckuvy] [-b blocksize] [-f file] [-s fileno]",
- "restore -R [-ckuvy] [-b blocksize] [-f file] [-s fileno]",
- "restore -x [-chkmuvy] [-b blocksize] [-f file] [-s fileno] [file ...]",
- "restore -t [-chkuvy] [-b blocksize] [-f file] [-s fileno] [file ...]");
- done(1);
+ "restore -i [-ch" kerbflag "muvy] [-b blocksize] [-f file] [-s fileno]",
+ "restore -r [-c" kerbflag "uvy] [-b blocksize] [-f file] [-s fileno]",
+ "restore -R [-c" kerbflag "uvy] [-b blocksize] [-f file] [-s fileno]",
+ "restore -x [-ch" kerbflag "muvy] [-b blocksize] [-f file] [-s fileno] [file ...]",
+ "restore -t [-ch" kerbflag "kuvy] [-b blocksize] [-f file] [-s fileno] [file ...]");
+ exit(1);
}
/*
* getopt(3) will like.
*/
static void
-obsolete(argcp, argvp)
- int *argcp;
- char **argvp[];
+obsolete(int *argcp, char **argvp[])
{
int argc, flags;
- char *ap, **argv, *flagsp=NULL, **nargv, *p=NULL;
+ char *ap, **argv, *flagsp = NULL, **nargv, *p = NULL;
/* Setup. */
argv = *argvp;
/* Allocate space for new arguments. */
if ((*argvp = nargv = malloc((argc + 1) * sizeof(char *))) == NULL ||
(p = flagsp = malloc(strlen(ap) + 2)) == NULL)
- err(1, NULL);
+ err(1, "malloc args");
*nargv++ = *argv;
argv += 2, argc -= 2;
usage();
}
if ((nargv[0] = malloc(strlen(*argv) + 2 + 1)) == NULL)
- err(1, NULL);
+ err(1, "malloc arg");
nargv[0][0] = '-';
nargv[0][1] = *ap;
(void)strcpy(&nargv[0][2], *argv);