X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fitime.c;h=3fed4dc4d4180df5f4c5c066238519eca2447e31;hb=109e9e1d1a904627eeae4d519a0f694795b2892c;hp=e29632cf75626cf721a38ab238d282f2bcbcd46c;hpb=8d4197bb9ba5bbcef21409231ed8903b0cac353a;p=dump.git

diff --git a/dump/itime.c b/dump/itime.c
index e29632c..3fed4dc 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 <card@Linux.EU.Org>, 1994-1997
- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *	Stelian Pop <pop@noos.fr>, 1999-2000
+ *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*-
@@ -40,11 +40,8 @@
  */
 
 #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.4 1999/10/11 13:08:07 stelian Exp $";
+	"$Id: itime.c,v 1.13 2000/12/04 15:43:16 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -82,10 +79,10 @@ static const char rcsid[] =
 
 #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 *));
@@ -172,10 +169,11 @@ getdumptime(int createdumpdates)
 	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 && level == lastlevel)
+	/* 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)
@@ -265,7 +263,7 @@ 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)
@@ -297,11 +295,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);
 }