X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Functime.c;h=684719d25ecab940fed124a1a693e0702d61e48d;hp=eccc5099442e4d8766682bcfd27c66de0c8be8ac;hb=572eed315d3d848cb336d8f51098038377434377;hpb=1227625a12a66e0ded78a1997c2d23f23202a382

diff --git a/dump/unctime.c b/dump/unctime.c
index eccc509..684719d 100644
--- a/dump/unctime.c
+++ b/dump/unctime.c
@@ -1,8 +1,9 @@
 /*
  *	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 <stelian@popies.net>, 1999-2000
+ *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  */
 
 /*-
@@ -17,11 +18,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -39,22 +36,33 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)unctime.c	8.2 (Berkeley) 6/14/94";
+static const char rcsid[] =
+	"$Id: unctime.c,v 1.16 2003/03/30 15:40:37 stelian Exp $";
 #endif /* not lint */
 
-#include <sys/types.h>
-
-#include <stdio.h>
+#include <config.h>
+#include <sys/time.h>
 #include <time.h>
 #ifdef __STDC__
 #include <stdlib.h>
 #include <string.h>
 #endif
 
-#ifndef __P
-#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <stdio.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>
 #endif
 
+#include "dump.h"
+
 /*
  * Convert a ctime(3) format string into a system format date.
  * Return the date thus calculated.
@@ -72,16 +80,18 @@ static char sccsid[] = "@(#)unctime.c	8.2 (Berkeley) 6/14/94";
 #define	E_MINUTE	14
 #define	E_SECOND	17
 #define	E_YEAR		20
+#define E_TZOFFSET      25
 
-static	int lookup __P((char *));
+static	int lookup __P((const char *));
 
 
 time_t
-unctime(str)
-	char *str;
+unctime(const char *str)
 {
 	struct tm then;
-	char dbuf[26];
+	char dbuf[32];
+	time_t rtime;
+	int tzoffset;
 
 	(void) strncpy(dbuf, str, sizeof(dbuf) - 1);
 	dbuf[sizeof(dbuf) - 1] = '\0';
@@ -94,17 +104,24 @@ unctime(str)
 	then.tm_sec = atoi(&dbuf[E_SECOND]);
 	then.tm_year = atoi(&dbuf[E_YEAR]) - 1900;
 	then.tm_isdst = -1;
-	return(mktime(&then));
+	if (strlen(str) >= E_TZOFFSET+5) {
+		rtime = timegm(&then);
+		/* add timezone offset */
+		tzoffset = atoi(&dbuf[E_TZOFFSET]);
+		rtime -= (tzoffset / 100 * 3600) + (tzoffset % 100) * 60;
+	} else {
+		rtime = timelocal(&then);
+	}
+	return(rtime);
 }
 
 static char months[] =
 	"JanFebMarAprMayJunJulAugSepOctNovDec";
 
 static int
-lookup(str)
-	char *str;
+lookup(const char *str)
 {
-	register char *cp, *cp2;
+	const char *cp, *cp2;
 
 	for (cp = months, cp2 = str; *cp != '\0'; cp += 3)
 		if (strncmp(cp, cp2, 3) == 0)