X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fitime.c;h=aeaaec01f8f9ee8c92ed88d717b398956cc4cdf4;hb=d86089d1dfe8565a3cf6f9d6e2fe96d29d6ab5f1;hp=09b1f3365a4c858a174fa33492899fd4fa375954;hpb=ebcbe7f6c10482913b60fc792e72e494b439b242;p=dump.git

diff --git a/dump/itime.c b/dump/itime.c
index 09b1f33..aeaaec0 100644
--- a/dump/itime.c
+++ b/dump/itime.c
@@ -2,7 +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-2000
+ *	Stelian Pop <stelian@popies.net>, 1999-2000
+ *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  */
 
 /*-
@@ -40,18 +41,33 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: itime.c,v 1.9 2000/01/21 10:17:41 stelian Exp $";
+	"$Id: itime.c,v 1.23 2002/08/01 10:23:26 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#ifdef __STDC__
+#include <stdlib.h>
+#include <string.h>
+#endif
+
 #include <sys/param.h>
 #include <sys/time.h>
+#include <time.h>
+#include <fcntl.h>
 #ifdef	__linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
+#include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #include <sys/file.h>
 #include <unistd.h>
-#else
-#ifdef sunos
+#elif defined sunos
 #include <sys/vnode.h>
 
 #include <ufs/fsdir.h>
@@ -60,28 +76,15 @@ static const char rcsid[] =
 #else
 #include <ufs/ufs/dinode.h>
 #endif
-#endif
 
 #include <protocols/dumprestore.h>
 
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#ifdef __STDC__
-#include <stdlib.h>
-#include <string.h>
-#endif
-
-#ifdef	__linux__
-#include <ext2fs/ext2fs.h>
-#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 *));
@@ -92,6 +95,7 @@ void
 initdumptimes(int createdumpdates)
 {
 	FILE *df;
+	struct flock lock;
 
 	if ((df = fopen(dumpdates, "r")) == NULL) {
 		if (errno != ENOENT) {
@@ -120,7 +124,11 @@ initdumptimes(int createdumpdates)
 			msg("WARNING: no file `%s'\n", dumpdates);
 	}
 	if (df != NULL) {
-		(void) flock(fileno(df), LOCK_SH);
+		memset(&lock, 0, sizeof(lock));
+		lock.l_type = F_RDLCK;
+		if (fcntl(fileno(df), F_SETLKW, &lock) < 0)
+			quit("cannot set read lock on %s: %s\n",
+				dumpdates, strerror(errno));
 		readdumptimes(df);
 		(void) fclose(df);
 	}
@@ -129,8 +137,8 @@ initdumptimes(int createdumpdates)
 static void
 readdumptimes(FILE *df)
 {
-	register int i;
-	register struct	dumptime *dtwalk;
+	int i;
+	struct	dumptime *dtwalk;
 
 	for (;;) {
 		dtwalk = (struct dumptime *)calloc(1, sizeof (struct dumptime));
@@ -156,14 +164,12 @@ readdumptimes(FILE *df)
 void
 getdumptime(int createdumpdates)
 {
-	register struct dumpdates *ddp;
-	register int i;
-	char *fname;
+	struct dumpdates *ddp;
+	int i;
 
-	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';
@@ -182,15 +188,11 @@ getdumptime(int createdumpdates)
 	 *	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;
@@ -201,18 +203,20 @@ void
 putdumptime(void)
 {
 	FILE *df;
-	register struct dumpdates *dtwalk;
-	register int i;
+	struct dumpdates *dtwalk;
+	int i;
 	int fd;
-	char *fname;
+	struct flock lock;
 
 	if(uflag == 0)
 		return;
 	if ((df = fopen(dumpdates, "r+")) == NULL)
 		quit("cannot rewrite %s: %s\n", dumpdates, strerror(errno));
 	fd = fileno(df);
-	(void) flock(fd, LOCK_EX);
-	fname = disk;
+	memset(&lock, 0, sizeof(lock));
+	lock.l_type = F_WRLCK;
+	if (fcntl(fd, F_SETLKW, &lock) < 0)
+		quit("cannot set write lock on %s: %s\n", dumpdates, strerror(errno));
 	free((char *)ddatev);
 	ddatev = 0;
 	nddates = 0;
@@ -223,7 +227,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)
@@ -238,7 +242,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;
 
@@ -250,12 +254,6 @@ 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
@@ -299,7 +297,7 @@ makedumpdate(struct dumpdates *ddp, char *tbuf)
 	/* device name */
 	if ( NULL == (tok = strsep( &tbuf, " ")) )
 		return(-1);
-	if ( strlen(tok) >  NAME_MAX )
+	if ( strlen(tok) >  MAXPATHLEN )
 		return(-1);
 	strcpy(ddp->dd_name, tok);
 
@@ -317,5 +315,7 @@ makedumpdate(struct dumpdates *ddp, char *tbuf)
 	ddp->dd_ddate = unctime(tbuf);
 	if (ddp->dd_ddate < 0)
 		return(-1);
+	/* fstab entry */
+	ddp->dd_fstab = fstabsearch(ddp->dd_name);
 	return(0);
 }