X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fmain.c;h=d7462c89fc6030c9c8c8cae93115297aaa17ad69;hp=272d5978a29bd7adc631f902195f0fb8467e91cc;hb=54ec08c6ea42e9189423def508c5119f33466db2;hpb=35b24fb7fabcf6df3b37aebf70c228d5b0688d32 diff --git a/dump/main.c b/dump/main.c index 272d597..d7462c8 100644 --- a/dump/main.c +++ b/dump/main.c @@ -41,10 +41,11 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.42 2001/04/10 12:46:53 stelian Exp $"; + "$Id: main.c,v 1.54 2001/07/19 09:49:35 stelian Exp $"; #endif /* not lint */ #include +#include #include #include #include @@ -57,10 +58,14 @@ static const char rcsid[] = #include #include +#include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include -#include #include #include #elif defined sunos @@ -91,7 +96,7 @@ int ntrec = NTREC; /* # tape blocks in each tape record */ int cartridge = 0; /* Assume non-cartridge tape */ #ifdef USE_QFA int tapepos = 0; /* assume no QFA tapeposition needed by user */ -#endif /* USA_QFA */ +#endif /* USE_QFA */ int dokerberos = 0; /* Use Kerberos authentication */ long dev_bsize = 1; /* recalculated below */ long blocksperfile; /* output blocks per file */ @@ -109,9 +114,11 @@ 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)); +static void do_exclude_from_file __P((char *)); +static void do_exclude_ino_str __P((char *)); -dump_ino_t iexclude_list[IEXCLUDE_MAXNUM];/* the inode exclude list */ -int iexclude_num = 0; /* number of elements in the list */ +static dump_ino_t iexclude_list[IEXCLUDE_MAXNUM];/* the inode exclude list */ +static int iexclude_num = 0; /* number of elements in the list */ int main(int argc, char *argv[]) @@ -124,6 +131,8 @@ main(int argc, char *argv[]) register int ch; int i, anydirskipped, bflag = 0, Tflag = 0, honorlevel = 1; dump_ino_t maxino; + struct STAT statbuf; + dev_t filedev = 0; #ifdef __linux__ errcode_t retval; char directory[MAXPATHLEN]; @@ -158,10 +167,10 @@ main(int argc, char *argv[]) #ifdef USE_QFA gTapeposfd = -1; -#endif /* USA_QFA */ +#endif /* USE_QFA */ while ((ch = getopt(argc, argv, - "0123456789aB:b:cd:e:f:F:h:L:" + "0123456789aB:b:cd:e:E:f:F:h:L:" #ifdef KERBEROS "k" #endif @@ -197,6 +206,7 @@ main(int argc, char *argv[]) if (ntrec > maxbsize/1024) { msg("Please choose a blocksize <= %dkB\n", maxbsize/1024); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } bflag = 1; @@ -216,17 +226,19 @@ main(int argc, char *argv[]) /* 04-Feb-00 ILC */ case 'e': /* exclude an inode */ - if (iexclude_num == IEXCLUDE_MAXNUM) { - (void)fprintf(stderr, "Too many -e options\n"); - exit(X_STARTUP); + { + char *p = optarg, *q; + while ((q = strchr(p, ','))) { + *q = '\0'; + do_exclude_ino_str(p); + p = q + 1; } - iexclude_list[iexclude_num++] = numarg("inode to exclude",0L,0L); - if (iexclude_list[iexclude_num-1] <= ROOTINO) { - (void)fprintf(stderr, "Cannot exclude inode %ld\n", (long)iexclude_list[iexclude_num-1]); - exit(X_STARTUP); + do_exclude_ino_str(p); } - msg("Added %d to exclude list\n", - iexclude_list[iexclude_num-1]); + break; + + case 'E': /* exclude inodes read from file */ + do_exclude_from_file(optarg); break; case 'f': /* output file */ @@ -277,7 +289,7 @@ main(int argc, char *argv[]) gTapeposfile = optarg; tapepos = 1; break; -#endif /* USA_QFA */ +#endif /* USE_QFA */ case 's': /* tape size, feet */ unlimited = 0; @@ -291,8 +303,8 @@ main(int argc, char *argv[]) case 'T': /* time of last dump */ spcl.c_ddate = unctime(optarg); if (spcl.c_ddate < 0) { - (void)fprintf(stderr, "bad time \"%s\"\n", - optarg); + msg("bad time \"%s\"\n", optarg); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } Tflag = 1; @@ -322,26 +334,20 @@ main(int argc, char *argv[]) argv += optind; if (argc < 1) { - (void)fprintf(stderr, "Must specify disk or filesystem\n"); + msg("Must specify disk or filesystem\n"); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } diskparam = *argv++; if (strlen(diskparam) >= MAXPATHLEN) { - (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", - diskparam); + msg("Disk or filesystem name too long: %s\n", diskparam); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } argc--; - if (argc >= 1) { - (void)fprintf(stderr, "Unknown arguments to dump:"); - while (argc--) - (void)fprintf(stderr, " %s", *argv++); - (void)fprintf(stderr, "\n"); - exit(X_STARTUP); - } if (Tflag && uflag) { - (void)fprintf(stderr, - "You cannot use the T and u flags together.\n"); + msg("You cannot use the T and u flags together.\n"); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } if (strcmp(tapeprefix, "-") == 0) { @@ -349,7 +355,7 @@ main(int argc, char *argv[]) tapeprefix = "standard output"; } - if (blocksperfile) + if (blocksperfile && !compressed) blocksperfile = blocksperfile / ntrec * ntrec; /* round down */ else if (!unlimited) { /* @@ -374,13 +380,15 @@ main(int argc, char *argv[]) *tapeprefix++ = '\0'; #ifdef RDUMP if (index(tapeprefix, '\n')) { - (void)fprintf(stderr, "invalid characters in tape\n"); - exit(X_STARTUP); + msg("invalid characters in tape\n"); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); } if (rmthost(host) == 0) exit(X_STARTUP); #else - (void)fprintf(stderr, "remote dump not enabled\n"); + msg("remote dump not enabled\n"); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); #endif } @@ -416,6 +424,7 @@ main(int argc, char *argv[]) of LABEL= or UID= but it was not found */ msg("Cannot find a disk having %s\n", diskparam); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } /* @@ -425,6 +434,16 @@ main(int argc, char *argv[]) * the file system name with or without the leading '/'. */ if ((dt = fstabsearch(disk)) != NULL) { + /* if found then only one parameter (i.e. partition) + * is allowed */ + if (argc >= 1) { + (void)fprintf(stderr, "Unknown arguments to dump:"); + while (argc--) + (void)fprintf(stderr, " %s", *argv++); + (void)fprintf(stderr, "\n"); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } disk = rawname(dt->fs_spec); (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN); (void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN); @@ -470,11 +489,13 @@ main(int argc, char *argv[]) if (directory[0] != 0) { if (level != '0') { - (void)fprintf(stderr, "Only level 0 dumps are allowed on a subdirectory\n"); + msg("Only level 0 dumps are allowed on a subdirectory\n"); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } if (uflag) { - (void)fprintf(stderr, "You can't update the dumpdates file when dumping a subdirectory\n"); + msg("You can't update the dumpdates file when dumping a subdirectory\n"); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } } @@ -500,10 +521,18 @@ main(int argc, char *argv[]) strncpy(tape, tapeprefix, MAXPATHLEN); tape[MAXPATHLEN - 1] = '\0'; + if (!pipeout) { + if (STAT(tape, &statbuf) != -1) + fifoout= statbuf.st_mode & S_IFIFO; + } + if (!sizest) { msg("Date of this level %c dump: %s", level, ctime4(&spcl.c_date)); +#ifdef USE_QFA + gThisDumpDate = spcl.c_date; +#endif if (spcl.c_ddate) msg("Date of last level %c dump: %s", lastlevel, ctime4(&spcl.c_ddate)); @@ -519,16 +548,19 @@ main(int argc, char *argv[]) if (retval) { com_err(disk, retval, "while opening filesystem"); if (retval == EXT2_ET_REV_TOO_HIGH) - printf ("Get a newer version of dump!\n"); + msg("Get a newer version of dump!\n"); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } if (fs->super->s_rev_level > DUMP_CURRENT_REV) { com_err(disk, retval, "while opening filesystem"); - printf ("Get a newer version of dump!\n"); + msg("Get a newer version of dump!\n"); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } - if ((diskfd = open(disk, O_RDONLY)) < 0) { + if ((diskfd = OPEN(disk, O_RDONLY)) < 0) { msg("Cannot open %s\n", disk); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } /* if no user label specified, use ext2 filesystem label if available */ @@ -556,6 +588,7 @@ main(int argc, char *argv[]) #else /* __linux __*/ if ((diskfd = open(disk, O_RDONLY)) < 0) { msg("Cannot open %s\n", disk); + msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); } sync(); @@ -586,10 +619,13 @@ main(int argc, char *argv[]) nonodump = spcl.c_level < honorlevel; - msg("Label: %s\n", spcl.c_label); + if (!sizest) { + msg("Label: %s\n", spcl.c_label); - if (compressed) - msg("Compressing output at compression level %d\n", compressed); + if (compressed) + msg("Compressing output at compression level %d\n", + compressed); + } #if defined(SIGINFO) (void)signal(SIGINFO, statussig); @@ -600,8 +636,51 @@ main(int argc, char *argv[]) #ifdef __linux__ if (directory[0] == 0) anydirskipped = mapfiles(maxino, &tapesize); - else - anydirskipped = mapfilesfromdir(maxino, &tapesize, directory); + else { + if (STAT(pathname, &statbuf) == -1) { + msg("File cannot be accessed (%s).\n", pathname); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } + filedev = statbuf.st_dev; + if (!(statbuf.st_mode & S_IFDIR)) /* is a file */ + anydirskipped = maponefile(maxino, &tapesize, + directory); + else + anydirskipped = mapfilesfromdir(maxino, &tapesize, + directory); + } + while (argc--) { + int anydirskipped2; + char *p = *argv; + /* check if file is available */ + if (STAT(p, &statbuf) == -1) { + msg("File cannot be accessed (%s).\n", p); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } + /* check if file is on same unix partiton as the first + * argument */ + if (statbuf.st_dev != filedev) { + msg("Files are not on same file system (%s).\n", p); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } + /* check if file is a directory */ + if (!(statbuf.st_mode & S_IFDIR)) + anydirskipped2 = maponefile(maxino, &tapesize, + p+strlen(dt->fs_file)); + else + /* read directory inodes. + * NOTE: nested directories are not recognized + * so inodes may be umped twice! + */ + anydirskipped2 = mapfilesfromdir(maxino, &tapesize, + p+strlen(dt->fs_file)); + if (!anydirskipped) + anydirskipped = anydirskipped2; + argv++; + } #else anydirskipped = mapfiles(maxino, &tapesize); #endif @@ -751,7 +830,7 @@ main(int argc, char *argv[]) tnow = trewind(); - if (pipeout) + if (pipeout || fifoout) msg("%ld tape blocks (%.2fMB)\n", spcl.c_tapea, ((double)spcl.c_tapea * TP_BSIZE / 1048576)); else @@ -811,12 +890,11 @@ usage(void) #endif "MnSu" "] [-B records] [-b blocksize] [-d density]\n" - "\t%s [-e inode#] [-f file] [-h level] " + "\t%s [-e inode#,inode#,...] [-E file] [-f file] [-h level] " #ifdef USE_QFA "[-Q file] " #endif - "[-s feet]\n" - "\t%s [-T date] " + "\n\t%s [-s feet] [-T date] " #ifdef HAVE_ZLIB "[-z zlevel] " #endif @@ -854,9 +932,9 @@ sig(int signo) case SIGHUP: case SIGTERM: case SIGTRAP: - if (pipeout) + if (pipeout || fifoout) quit("Signal on pipe: cannot recover\n"); - msg("Rewriting attempted as response to unknown signal.\n"); + msg("Rewriting attempted as response to unknown signal: %d.\n", signo); (void)fflush(stderr); (void)fflush(stdout); close_rewind(); @@ -923,6 +1001,7 @@ obsolete(int *argcp, char **argvp[]) case 'b': case 'd': case 'e': + case 'E': case 'f': case 'F': case 'h': @@ -964,3 +1043,78 @@ obsolete(int *argcp, char **argvp[]) /* Update argument count. */ *argcp = nargv - *argvp - 1; } + +/* + * This tests whether an inode is in the exclude list + */ +int +exclude_ino(dump_ino_t ino) +{ + /* 04-Feb-00 ILC */ + if (iexclude_num) { /* if there are inodes in the exclude list */ + int idx; /* then check this inode against it */ + for (idx = 0; idx < iexclude_num; idx++) + if (ino == iexclude_list[idx]) + return 1; + } + return 0; +} + +/* + * This tests adds an inode to the exclusion list if it isn't already there + */ +void +do_exclude_ino(dump_ino_t ino, const char *reason) +{ + if (!exclude_ino(ino)) { + if (iexclude_num == IEXCLUDE_MAXNUM) { + msg("Too many exclude options\n"); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } + if (reason) + msg("Added inode %u to exclude list (%s)\n", + ino, reason); + else + msg("Added inode %u to exclude list\n", ino); + iexclude_list[iexclude_num++] = ino; + } +} + +static void +do_exclude_ino_str(char * ino) { + char *r; + unsigned long inod; + + inod = strtoul(ino, &r, 10); + if (*r != '\0' || inod <= ROOTINO) { + msg("Invalid inode argument %s\n", ino); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } + do_exclude_ino(inod, NULL); +} + +/* + * This reads a file containing one inode number per line and exclude them all + */ +static void +do_exclude_from_file(char *file) { + FILE *f; + char *p, fname[MAXPATHLEN]; + + + if (!( f = fopen(file, "r")) ) { + msg("Cannot open file for reading: %s\n", file); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } + while (( p = fgets(fname, MAXPATHLEN, f))) { + if ( *p && *(p + strlen(p) - 1) == '\n' ) /* possible null string */ + *(p + strlen(p) - 1) = '\0'; + if ( !*p ) /* skip empty lines */ + continue; + do_exclude_ino_str(p); + } + fclose(f); +}