Check for the e2fsprogs header <ext2fs/ext2_fs.h> instead of the kernel header if...

[dump.git] / dump / unctime.c

diff --git a/dump/unctime.c b/dump/unctime.c
index d821b78652a2fc8ed0f6fa0ce8bee59bb5115cc7..c03bb652677e60bd77cf5e04f1ae899f219ad44e 100644 (file)
--- a/dump/unctime.c
+++ b/dump/unctime.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,19 +40,32 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)unctime.c  8.2 (Berkeley) 6/14/94";
-#endif
 static const char rcsid[] =
-       "$Id: unctime.c,v 1.2 1999/10/11 12:53:23 stelian Exp $";
+       "$Id: unctime.c,v 1.11 2001/06/18 10:58:28 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
 #include <time.h>
 #ifdef __STDC__
 #include <stdlib.h>
 #include <string.h>
 #endif
 
+#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.
@@ -71,12 +84,11 @@ static const char rcsid[] =
 #define        E_SECOND        17
 #define        E_YEAR          20
 
-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];
@@ -99,10 +111,9 @@ static char months[] =
        "JanFebMarAprMayJunJulAugSepOctNovDec";
 
 static int
-lookup(str)
-       char *str;
+lookup(const char *str)
 {
-       register char *cp, *cp2;
+       register const char *cp, *cp2;
 
        for (cp = months, cp2 = str; *cp != '\0'; cp += 3)
                if (strncmp(cp, cp2, 3) == 0)