X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fitime.c;h=e29632cf75626cf721a38ab238d282f2bcbcd46c;hb=refs%2Ftags%2Frelease_0_4b7;hp=441085f1bbcf79eb12d705ae81b927e56845ec81;hpb=b45f51d61e911ac8a040bef1efda6afd82261e03;p=dump.git

diff --git a/dump/itime.c b/dump/itime.c
index 441085f..e29632c 100644
--- a/dump/itime.c
+++ b/dump/itime.c
@@ -44,7 +44,7 @@
 static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id: itime.c,v 1.2 1999/10/11 12:53:22 stelian Exp $";
+	"$Id: itime.c,v 1.4 1999/10/11 13:08:07 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -93,7 +93,7 @@ static	int makedumpdate __P((struct dumpdates *, char *));
 static	void readdumptimes __P((FILE *));
 
 void
-initdumptimes()
+initdumptimes(int createdumpdates)
 {
 	FILE *df;
 
@@ -103,30 +103,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;
@@ -153,7 +158,7 @@ readdumptimes(df)
 }
 
 void
-getdumptime()
+getdumptime(int createdumpdates)
 {
 	register struct dumpdates *ddp;
 	register int i;
@@ -167,7 +172,14 @@ getdumptime()
 	spcl.c_ddate = 0;
 	lastlevel = '0';
 
-	initdumptimes();
+	/* 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 && level == lastlevel)
+		return;
+	initdumptimes(createdumpdates);
+	if (ddatev == NULL)
+		return;
 	/*
 	 *	Go find the entry with the same name for a lower increment
 	 *	and older date
@@ -189,7 +201,7 @@ getdumptime()
 }
 
 void
-putdumptime()
+putdumptime(void)
 {
 	FILE *df;
 	register struct dumpdates *dtwalk;
@@ -250,9 +262,7 @@ putdumptime()
 }
 
 static void
-dumprecout(file, what)
-	FILE *file;
-	struct dumpdates *what;
+dumprecout(FILE *file, struct dumpdates *what)
 {
 
 	if (fprintf(file, DUMPOUTFMT,
@@ -265,14 +275,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)
@@ -287,11 +295,9 @@ getrecord(df, ddatep)
 }
 
 static int
-makedumpdate(ddp, tbuf)
-	struct dumpdates *ddp;
-	char *tbuf;
+makedumpdate(struct dumpdates *ddp, char *tbuf)
 {
-	char un_buf[128];
+	char un_buf[BUFSIZ];
 
 	(void) sscanf(tbuf, DUMPINFMT, ddp->dd_name, &ddp->dd_level, un_buf);
 	ddp->dd_ddate = unctime(un_buf);