X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Futilities.c;h=4960b9ab4e3a5e8d9757c9d546e4b3de99df5ef0;hp=95cb2160acb619896fd2b36ef81e76eb93c29487;hb=e51470bfc05d83f82c37d24504220c7163bbd4c1;hpb=717bdcef94c7487831a43048751ca868f7d8bae4

diff --git a/restore/utilities.c b/restore/utilities.c
index 95cb216..4960b9a 100644
--- a/restore/utilities.c
+++ b/restore/utilities.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@noos.fr>, 1999-2000
- *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
+ *	Stelian Pop <stelian@popies.net>, 1999-2000
+ *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  */
 
 /*
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: utilities.c,v 1.15 2001/04/24 10:59:13 stelian Exp $";
+	"$Id: utilities.c,v 1.18 2002/01/25 14:59:53 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -57,7 +57,11 @@ static const char rcsid[] =
 #ifdef	__linux__
 #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 <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #else	/* __linux__ */
@@ -481,13 +485,13 @@ panic(fmt, va_alist)
  * if no smaller inode found return tnum=0 and tpos=0
  */
 int
-Inode2Tapepos(dump_ino_t ino, long *tnum, long *tpos, int exactmatch)
+Inode2Tapepos(dump_ino_t ino, long *tnum, long long *tpos, int exactmatch)
 {
 	char *p, *pp;
 	char numbuff[32];
 	unsigned long tmpino;
 	long tmptnum;
-	long tmptpos;
+	long long tmptpos;
 
 	*tpos = 0;
 	*tnum = 0;
@@ -519,7 +523,7 @@ Inode2Tapepos(dump_ino_t ino, long *tnum, long *tpos, int exactmatch)
 		/* read tapepos */
 		while ((*p != 0) && (*p != '\t'))
 			*pp++ = *p++;
-		tmptpos = atol(numbuff);
+		tmptpos = atoll(numbuff);
 
 		if (exactmatch) {
 			if (tmpino == ino)  {