X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fitime.c;h=41eb78a9c20ea8ce956afd05640ac0bfce284d86;hb=8cef350eb9ffa2e543a95756a8f605175380f7b0;hp=a1b66f9a33ddf4194dd90ee933d2c59d3d0d8c8a;hpb=ddd2ef55b78a62c4bc3daad18bef8a90e85a2052;p=dump.git diff --git a/dump/itime.c b/dump/itime.c index a1b66f9..41eb78a 100644 --- a/dump/itime.c +++ b/dump/itime.c @@ -2,8 +2,8 @@ * 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-2000 + * Stelian Pop - Alcôve , 2000 */ /*- @@ -40,22 +40,33 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; -#endif static const char rcsid[] = - "$Id: itime.c,v 1.3 1999/10/11 12:59:18 stelian Exp $"; + "$Id: itime.c,v 1.20 2001/07/18 09:12:05 stelian Exp $"; #endif /* not lint */ +#include +#include +#include +#include +#ifdef __STDC__ +#include +#include +#endif + #include #include +#include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif +#include #include #include #include -#else -#ifdef sunos +#elif defined sunos #include #include @@ -64,28 +75,15 @@ static const char rcsid[] = #else #include #endif -#endif #include -#include -#include -#include -#ifdef __STDC__ -#include -#include -#endif - -#ifdef __linux__ -#include -#endif - #include "dump.h" -struct dumpdates **ddatev = 0; -int nddates = 0; -int ddates_in = 0; -struct dumptime *dthead = 0; +struct dumpdates **ddatev; +int nddates; +int ddates_in; +struct dumptime *dthead; static void dumprecout __P((FILE *, struct dumpdates *)); static int getrecord __P((FILE *, struct dumpdates *)); @@ -93,7 +91,7 @@ static int makedumpdate __P((struct dumpdates *, char *)); static void readdumptimes __P((FILE *)); void -initdumptimes(void) +initdumptimes(int createdumpdates) { FILE *df; @@ -103,25 +101,31 @@ initdumptimes(void) strerror(errno)); /* NOTREACHED */ } - /* - * Dumpdates does not exist, make an empty one. - */ - msg("WARNING: no file `%s', making an empty one\n", dumpdates); - if ((df = fopen(dumpdates, "w")) == NULL) { - quit("cannot create %s: %s\n", dumpdates, - strerror(errno)); - /* NOTREACHED */ + if (createdumpdates) { + /* + * Dumpdates does not exist, make an empty one. + */ + msg("WARNING: no file `%s', making an empty one\n", dumpdates); + if ((df = fopen(dumpdates, "w")) == NULL) { + quit("cannot create %s: %s\n", dumpdates, + strerror(errno)); + /* NOTREACHED */ + } + (void) fclose(df); + if ((df = fopen(dumpdates, "r")) == NULL) { + quit("cannot read %s even after creating it: %s\n", + dumpdates, strerror(errno)); + /* NOTREACHED */ + } } + else + msg("WARNING: no file `%s'\n", dumpdates); + } + if (df != NULL) { + (void) flock(fileno(df), LOCK_SH); + readdumptimes(df); (void) fclose(df); - if ((df = fopen(dumpdates, "r")) == NULL) { - quit("cannot read %s even after creating it: %s\n", - dumpdates, strerror(errno)); - /* NOTREACHED */ - } } - (void) flock(fileno(df), LOCK_SH); - readdumptimes(df); - (void) fclose(df); } static void @@ -152,41 +156,37 @@ readdumptimes(FILE *df) } void -getdumptime(void) +getdumptime(int createdumpdates) { register struct dumpdates *ddp; register int i; - char *fname; - fname = disk; #ifdef FDEBUG msg("Looking for name %s in dumpdates = %s for level = %c\n", - fname, dumpdates, level); + disk, dumpdates, level); #endif spcl.c_ddate = 0; lastlevel = '0'; - /* if we're not going to update dumpdates, there's no point in reading - it, particularly since /var might not be mounted... wait until here - to benefit from the initialization of variables needed by parent */ - if (uflag == 0) + /* If this is a level 0 dump, and we're not updating + dumpdates, there's no point in trying to read + dumpdates. It may not exist yet, or may not be mounted. For + incrementals, we *must* read dumpdates (fail if it's not there!) */ + if ( (level == lastlevel) && !createdumpdates) + return; + initdumptimes(createdumpdates); + if (ddatev == NULL) return; - - initdumptimes(); /* * Go find the entry with the same name for a lower increment * and older date */ ITITERATE(i, ddp) { - if (strncmp(fname, ddp->dd_name, sizeof (ddp->dd_name)) != 0) + if (strncmp(disk, ddp->dd_name, sizeof (ddp->dd_name)) != 0) continue; if (ddp->dd_level >= level) continue; -#ifdef __linux__ if (ddp->dd_ddate <= (time_t)spcl.c_ddate) -#else - if (ddp->dd_ddate <= spcl.c_ddate) -#endif continue; spcl.c_ddate = ddp->dd_ddate; lastlevel = ddp->dd_level; @@ -200,7 +200,6 @@ putdumptime(void) register struct dumpdates *dtwalk; register int i; int fd; - char *fname; if(uflag == 0) return; @@ -208,7 +207,6 @@ putdumptime(void) quit("cannot rewrite %s: %s\n", dumpdates, strerror(errno)); fd = fileno(df); (void) flock(fd, LOCK_EX); - fname = disk; free((char *)ddatev); ddatev = 0; nddates = 0; @@ -219,7 +217,7 @@ putdumptime(void) quit("fseek: %s\n", strerror(errno)); spcl.c_ddate = 0; ITITERATE(i, dtwalk) { - if (strncmp(fname, dtwalk->dd_name, + if (strncmp(disk, dtwalk->dd_name, sizeof (dtwalk->dd_name)) != 0) continue; if (dtwalk->dd_level != level) @@ -234,7 +232,7 @@ putdumptime(void) (struct dumpdates *)calloc(1, sizeof (struct dumpdates)); nddates += 1; found: - (void) strncpy(dtwalk->dd_name, fname, sizeof (dtwalk->dd_name)); + (void) strncpy(dtwalk->dd_name, disk, sizeof (dtwalk->dd_name)); dtwalk->dd_level = level; dtwalk->dd_ddate = spcl.c_date; @@ -246,19 +244,13 @@ putdumptime(void) if (ftruncate(fd, ftell(df))) quit("ftruncate (%s): %s\n", dumpdates, strerror(errno)); (void) fclose(df); - msg("level %c dump on %s", level, -#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)); -#endif } static void dumprecout(FILE *file, struct dumpdates *what) { - if (fprintf(file, DUMPOUTFMT, + if (fprintf(file, "%s %c %s", what->dd_name, what->dd_level, ctime(&what->dd_ddate)) < 0) @@ -290,11 +282,30 @@ getrecord(FILE *df, struct dumpdates *ddatep) static int makedumpdate(struct dumpdates *ddp, char *tbuf) { - char un_buf[BUFSIZ]; + char *tok; + + /* device name */ + if ( NULL == (tok = strsep( &tbuf, " ")) ) + return(-1); + if ( strlen(tok) > MAXPATHLEN ) + return(-1); + strcpy(ddp->dd_name, tok); + + /* eat whitespace */ + for( ; *tbuf == ' ' ; tbuf++); + + /* dump level */ + ddp->dd_level = *tbuf; + ++tbuf; + + /* eat whitespace */ + for( ; *tbuf == ' ' ; tbuf++); - (void) sscanf(tbuf, DUMPINFMT, ddp->dd_name, &ddp->dd_level, un_buf); - ddp->dd_ddate = unctime(un_buf); + /* dump date */ + ddp->dd_ddate = unctime(tbuf); if (ddp->dd_ddate < 0) return(-1); + /* fstab entry */ + ddp->dd_fstab = fstabsearch(ddp->dd_name); return(0); }