X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=5e8f79f2a45bb7fe19b889456191453cb09acd55;hb=d1c73b9a3cd598653eb8b13531e8ca3c5c740d90;hp=c17684e1b05b5a245d4fa655bc3aff26191e47ba;hpb=b45f51d61e911ac8a040bef1efda6afd82261e03;p=dump.git diff --git a/dump/main.c b/dump/main.c index c17684e..5e8f79f 100644 --- a/dump/main.c +++ b/dump/main.c @@ -2,8 +2,7 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 - * + * Stelian Pop , 1999 */ /*- @@ -40,17 +39,8 @@ */ #ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1980, 1991, 1993, 1994\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/1/95"; -#endif static const char rcsid[] = - "$Id: main.c,v 1.2 1999/10/11 12:53:22 stelian Exp $"; + "$Id: main.c,v 1.8 1999/11/21 16:01:47 tiniou Exp $"; #endif /* not lint */ #include @@ -74,7 +64,7 @@ static const char rcsid[] = #include #include -#include +#include #include #include #include @@ -109,14 +99,13 @@ char *host = NULL; /* remote host (if any) */ char *__progname; #endif -static long numarg __P((char *, long, long)); +int maxbsize = 64*1024; /* XXX MAXBSIZE from sys/param.h */ +static long numarg __P((const char *, long, long)); static void obsolete __P((int *, char **[])); static void usage __P((void)); int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { register ino_t ino; register int dirty; @@ -131,6 +120,7 @@ main(argc, argv) char directory[NAME_MAX]; char pathname[NAME_MAX]; #endif + time_t tnow; char labelstr[LBLSIZE]; spcl.c_date = 0; @@ -147,8 +137,8 @@ main(argc, argv) #endif tsize = 0; /* Default later, based on 'c' option for cart tapes */ - if ((tape = getenv("TAPE")) == NULL) - tape = _PATH_DEFTAPE; + if ((tapeprefix = getenv("TAPE")) == NULL) + tapeprefix = _PATH_DEFTAPE; dumpdates = _PATH_DUMPDATES; temp = _PATH_DTMP; strcpy(labelstr, "none"); /* XXX safe strcpy. */ @@ -161,9 +151,9 @@ main(argc, argv) obsolete(&argc, &argv); #ifdef KERBEROS -#define optstring "0123456789aB:b:cd:f:h:kL:ns:T:uWw" +#define optstring "0123456789aB:b:cd:f:h:kL:Mns:T:uWw" #else -#define optstring "0123456789aB:b:cd:f:h:L:ns:T:uWw" +#define optstring "0123456789aB:b:cd:f:h:L:Mns:T:uWw" #endif while ((ch = getopt(argc, argv, optstring)) != -1) #undef optstring @@ -186,6 +176,12 @@ main(argc, argv) case 'b': /* blocks per tape write */ ntrec = numarg("number of blocks per write", 1L, 1000L); + if (ntrec > maxbsize/1024) { + msg("Please choose a blocksize <= %dKB\n", + maxbsize/1024); + exit(X_STARTUP); + } + bflag = 1; break; case 'c': /* Tape is cart. not 9-track */ @@ -199,7 +195,7 @@ main(argc, argv) break; case 'f': /* output file */ - tape = optarg; + tapeprefix = optarg; break; case 'h': @@ -229,6 +225,10 @@ main(argc, argv) } break; + case 'M': /* multi-volume flag */ + Mflag = 1; + break; + case 'n': /* notify operators */ notify = 1; break; @@ -246,11 +246,9 @@ main(argc, argv) } Tflag = 1; lastlevel = '?'; - argc--; - argv++; break; - case 'u': /* update /etc/dumpdates */ + case 'u': /* update dumpdates */ uflag = 1; break; @@ -283,9 +281,9 @@ main(argc, argv) "You cannot use the T and u flags together.\n"); exit(X_STARTUP); } - if (strcmp(tape, "-") == 0) { + if (strcmp(tapeprefix, "-") == 0) { pipeout++; - tape = "standard output"; + tapeprefix = "standard output"; } if (blocksperfile) @@ -307,12 +305,12 @@ main(argc, argv) tsize = cartridge ? 1700L*120L : 2300L*120L; } - if (strchr(tape, ':')) { - host = tape; - tape = strchr(host, ':'); - *tape++ = '\0'; + if (strchr(tapeprefix, ':')) { + host = tapeprefix; + tapeprefix = strchr(host, ':'); + *tapeprefix++ = '\0'; #ifdef RDUMP - if (index(tape, '\n')) { + if (index(tapeprefix, '\n')) { (void)fprintf(stderr, "invalid characters in tape\n"); exit(X_STARTUP); } @@ -339,7 +337,6 @@ main(argc, argv) signal(SIGTERM, sig); if (signal(SIGINT, interrupt) == SIG_IGN) signal(SIGINT, SIG_IGN); - set_operators(); /* /etc/group snarfed */ getfstab(); /* /etc/fstab snarfed */ /* @@ -348,8 +345,7 @@ main(argc, argv) * the special name missing the leading '/', * the file system name with or without the leading '/'. */ - dt = fstabsearch(disk); - if (dt != NULL) { + if ((dt = fstabsearch(disk)) != NULL) { disk = rawname(dt->fs_spec); (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN); (void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN); @@ -391,10 +387,23 @@ main(argc, argv) spcl.c_level = level - '0'; spcl.c_type = TS_TAPE; if (!Tflag) - getdumptime(); /* /etc/dumpdates snarfed */ + getdumptime(uflag); /* dumpdates snarfed */ + + if (spcl.c_ddate == 0 && spcl.c_level) { + msg("WARNING: There is no inferior level dump on this filesystem\n"); + msg("WARNING: Assuming a level 0 dump by default\n"); + level = '0'; + spcl.c_level = 0; + } + + if (Mflag) + snprintf(tape, NAME_MAX, "%s%03d", tapeprefix, tapeno + 1); + else + strncpy(tape, tapeprefix, NAME_MAX); + tape[NAME_MAX - 1] = '\0'; msg("Date of this level %c dump: %s", level, -#ifdef __linux +#ifdef __linux__ spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date)); #else spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date)); @@ -415,7 +424,7 @@ main(argc, argv) msg("Label: %s\n", labelstr); #ifdef __linux__ - retval = ext2fs_open(disk, 0, 0, 0, unix_io_manager, &fs); + retval = dump_fs_open(disk, &fs); if (retval) { com_err(disk, retval, "while opening filesystem"); if (retval == EXT2_ET_REV_TOO_HIGH) @@ -474,6 +483,10 @@ main(argc, argv) nonodump = spcl.c_level < honorlevel; +#if defined(SIGINFO) + (void)signal(SIGINFO, statussig); +#endif + msg("mapping (Pass I) [regular files]\n"); #ifdef __linux__ if (directory[0] == 0) @@ -543,7 +556,11 @@ main(argc, argv) "can't allocate tape buffers - try a smaller blocking factor.\n"); startnewtape(1); +#ifdef __linux__ + (void)time4(&(tstart_writing)); +#else (void)time((time_t *)&(tstart_writing)); +#endif dumpmap(usedinomap, TS_CLRI, maxino - 1); msg("dumping (Pass III) [directories]\n"); @@ -588,7 +605,11 @@ main(argc, argv) (void)dumpino(dp, ino); } +#ifdef __linux__ + (void)time4(&(tend_writing)); +#else (void)time((time_t *)&(tend_writing)); +#endif spcl.c_type = TS_END; for (i = 0; i < ntrec; i++) writeheader(maxino - 1); @@ -606,26 +627,48 @@ main(argc, argv) tend_writing - tstart_writing, spcl.c_tapea / (tend_writing - tstart_writing)); + tnow = do_stats(); putdumptime(); +#ifdef __linux__ + msg("DUMP: Date of this level %c dump: %s", level, + spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date)); +#else + msg("DUMP: Date of this level %c dump: %s", level, + spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date)); +#endif + msg("DUMP: Date this dump completed: %s", ctime(&tnow)); + + msg("DUMP: Average transfer rate: %ld KB/s\n", xferrate / tapeno); + trewind(); broadcast("DUMP IS DONE!\7\7\n"); msg("DUMP IS DONE\n"); Exit(X_FINOK); /* NOTREACHED */ - exit(1); /* gcc - shut up */ + return 0; /* gcc - shut up */ } static void -usage() +usage(void) { + char white[MAXPATHLEN]; + int i; + + strncpy(white, __progname, MAXPATHLEN-1); + white[MAXPATHLEN-1] = '\0'; + for (i=0; i vmax)) - errx(1, "%s must be between %ld and %ld", meaning, vmin, vmax); + errx(X_STARTUP, "%s must be between %ld and %ld", meaning, vmin, vmax); return (val); } void -sig(signo) - int signo; +sig(int signo) { switch(signo) { case SIGALRM: @@ -677,8 +717,7 @@ sig(signo) } char * -rawname(cp) - char *cp; +rawname(char *cp) { #ifdef __linux__ return cp; @@ -704,9 +743,7 @@ rawname(cp) * 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; @@ -723,7 +760,7 @@ obsolete(argcp, 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(X_STARTUP, "malloc new args"); *nargv++ = *argv; argv += 2; @@ -742,7 +779,7 @@ obsolete(argcp, argvp) usage(); } if ((nargv[0] = malloc(strlen(*argv) + 2 + 1)) == NULL) - err(1, NULL); + err(X_STARTUP, "malloc arg"); nargv[0][0] = '-'; nargv[0][1] = *ap; (void)strcpy(&nargv[0][2], *argv);