Waitpid problem with external RSH.

[dump.git] / dump / traverse.c

diff --git a/dump/traverse.c b/dump/traverse.c
index 59ce524c4c52495aa23e6a5ecf21cd548f2ba644..d3f99bfdf2994e681c592579fd046b678225a658 100644 (file)
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -2,8 +2,7 @@
  *     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@cybercable.fr>, 1999 
  */
 
 /*-
@@ -40,11 +39,8 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95";
-#endif
 static const char rcsid[] =
-       "$Id: traverse.c,v 1.3 1999/10/11 12:59:19 stelian Exp $";
+       "$Id: traverse.c,v 1.7 1999/11/02 09:35:56 tiniou Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -97,7 +93,6 @@ typedef       long fsizeT;
 #ifdef __linux__
 static int searchdir __P((struct ext2_dir_entry *dp, int offset,
                           int blocksize, char *buf, void *private));
-loff_t llseek (int fd, loff_t offset, int origin);
 #else
 static int dirindir __P((ino_t ino, daddr_t blkno, int level, long *size));
 static void dmpindir __P((ino_t ino, daddr_t blk, int level, fsizeT *size));
@@ -338,7 +333,7 @@ mapdirs(ino_t maxino, long *tapesize)
        register int isdir;
        register char *map;
        register ino_t ino;
-#ifndef __linux
+#ifndef __linux__
        register int i;
        long filesize;
 #endif
@@ -1017,8 +1012,8 @@ bread(daddr_t blkno, char *buf, int size)
 
 loop:
 #ifdef __linux__
-       if (llseek(diskfd, ((ext2_loff_t)blkno << dev_bshift), 0) !=
-                       ((ext2_loff_t)blkno << dev_bshift))
+       if (ext2fs_llseek(diskfd, (((ext2_loff_t)blkno) << dev_bshift), 0) !=
+                       (((ext2_loff_t)blkno) << dev_bshift))
 #else
        if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
                                                ((off_t)blkno << dev_bshift))
@@ -1063,8 +1058,8 @@ loop:
        memset(buf, 0, size);
        for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) {
 #ifdef __linux__
-               if (llseek(diskfd, ((ext2_loff_t)blkno << dev_bshift), 0) !=
-                               ((ext2_loff_t)blkno << dev_bshift))
+               if (ext2fs_llseek(diskfd, (((ext2_loff_t)blkno) << dev_bshift), 0) !=
+                               (((ext2_loff_t)blkno) << dev_bshift))
 #else
                if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
                                                ((off_t)blkno << dev_bshift))