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

[dump.git] / restore / restore.c

diff --git a/restore/restore.c b/restore/restore.c
index 86152040d158624e53693f007a812f138f7f6990..d9561d810fd6ab892d7d4a1d39d4c1b3a76c84c1 100644 (file)
--- a/restore/restore.c
+++ b/restore/restore.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: restore.c,v 1.15 2001/04/10 12:46:53 stelian Exp $";
+       "$Id: restore.c,v 1.18 2001/06/18 10:58:28 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -50,7 +50,12 @@ static const char rcsid[] =
 #ifdef __linux__
 #include <sys/param.h>
 #include <sys/time.h>
+#include <time.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <bsdcompat.h>
 #else  /* __linux__ */
 #include <ufs/ufs/dinode.h>
@@ -496,7 +501,7 @@ nodeupdates(char *name, dump_ino_t ino, int type)
         * for it, we discard the name knowing that it will be on the
         * next incremental tape.
         */
-       case NULL:
+       case 0:
                if (compare_ignore_not_found) break;
                fprintf(stderr, "%s: (inode %lu) not found on tape\n",
                        name, (unsigned long)ino);