X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fitime.c;h=64d7644c6f8123f4e6ec31e1fb17602b030b015c;hb=92a9bf12543aadfcc46e7ab9c2729b4d4d1f22ee;hp=f83459c511531d5e1a8fafd078c1453ab2992237;hpb=1227625a12a66e0ded78a1997c2d23f23202a382;p=dump.git

diff --git a/dump/itime.c b/dump/itime.c
index f83459c..64d7644 100644
--- a/dump/itime.c
+++ b/dump/itime.c
@@ -1,8 +1,8 @@
 /*
  *	Ported to Linux's Second Extended File System as part of the
  *	dump and restore backup suit
- *	Remy Card <card@Linux.EU.Org>, 1994, 1995, 1996
- *
+ *	Remy Card <card@Linux.EU.Org>, 1994-1997
+ *	Stelian Pop <pop@cybercable.fr>, 1999-2000
  */
 
 /*-
@@ -39,7 +39,8 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
+static const char rcsid[] =
+	"$Id: itime.c,v 1.10 2000/03/01 10:16:05 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -48,6 +49,7 @@ static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #include <linux/ext2_fs.h>
 #include <bsdcompat.h>
 #include <sys/file.h>
+#include <unistd.h>
 #else
 #ifdef sunos
 #include <sys/vnode.h>
@@ -68,7 +70,6 @@ static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #ifdef __STDC__
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #endif
 
 #ifdef	__linux__
@@ -88,7 +89,7 @@ static	int makedumpdate __P((struct dumpdates *, char *));
 static	void readdumptimes __P((FILE *));
 
 void
-initdumptimes()
+initdumptimes(int createdumpdates)
 {
 	FILE *df;
 
@@ -98,30 +99,35 @@ initdumptimes()
 			    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
-readdumptimes(df)
-	FILE *df;
+readdumptimes(FILE *df)
 {
 	register int i;
 	register struct	dumptime *dtwalk;
@@ -148,7 +154,7 @@ readdumptimes(df)
 }
 
 void
-getdumptime()
+getdumptime(int createdumpdates)
 {
 	register struct dumpdates *ddp;
 	register int i;
@@ -162,7 +168,15 @@ getdumptime()
 	spcl.c_ddate = 0;
 	lastlevel = '0';
 
-	initdumptimes();
+	/* 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;
 	/*
 	 *	Go find the entry with the same name for a lower increment
 	 *	and older date
@@ -184,7 +198,7 @@ getdumptime()
 }
 
 void
-putdumptime()
+putdumptime(void)
 {
 	FILE *df;
 	register struct dumpdates *dtwalk;
@@ -245,12 +259,10 @@ putdumptime()
 }
 
 static void
-dumprecout(file, what)
-	FILE *file;
-	struct dumpdates *what;
+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)
@@ -260,14 +272,12 @@ dumprecout(file, what)
 int	recno;
 
 static int
-getrecord(df, ddatep)
-	FILE *df;
-	struct dumpdates *ddatep;
+getrecord(FILE *df, struct dumpdates *ddatep)
 {
 	char tbuf[BUFSIZ];
 
 	recno = 0;
-	if ( (fgets(tbuf, sizeof (tbuf), df)) != tbuf)
+	if (fgets(tbuf, sizeof (tbuf), df) == NULL)
 		return(-1);
 	recno++;
 	if (makedumpdate(ddatep, tbuf) < 0)
@@ -282,14 +292,29 @@ getrecord(df, ddatep)
 }
 
 static int
-makedumpdate(ddp, tbuf)
-	struct dumpdates *ddp;
-	char *tbuf;
+makedumpdate(struct dumpdates *ddp, char *tbuf)
 {
-	char un_buf[128];
+	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);
 	return(0);