ext2fs: Use 64bit lseek when _FILE_OFFSET_BITS is 64

[tools/e2fsprogs.git] / lib / ext2fs / llseek.c

diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c
index 5a5e560..45f21d0 100644 (file)
--- a/lib/ext2fs/llseek.c
+++ b/lib/ext2fs/llseek.c
@@ -4,14 +4,19 @@
  * Copyright (C) 1994, 1995, 1996, 1997 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
+#include "config.h"
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -36,7 +41,7 @@
 
 #else
 #if defined(HAVE_LLSEEK)
-#include <syscall.h>
+#include <sys/syscall.h>
 
 #ifndef HAVE_LLSEEK_PROTOTYPE
 extern long long llseek (int fd, long long offset, int origin);
@@ -46,9 +51,9 @@ extern long long llseek (int fd, long long offset, int origin);
 
 #else  /* ! HAVE_LLSEEK */
 
-#if SIZEOF_LONG == SIZEOF_LONG_LONG
+#if SIZEOF_LONG == SIZEOF_LONG_LONG || _FILE_OFFSET_BITS+0 == 64
 
-#define llseek lseek
+#define my_llseek lseek
 
 #else /* SIZEOF_LONG != SIZEOF_LONG_LONG */
 
@@ -64,7 +69,7 @@ static int _llseek (unsigned int, unsigned long,
 
 static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
                 unsigned long, offset_low,ext2_loff_t *,result,
-                unsigned int, origin)
+                unsigned int, origin);
 #endif
 
 static ext2_loff_t my_llseek (int fd, ext2_loff_t offset, int origin)
@@ -74,7 +79,7 @@ static ext2_loff_t my_llseek (int fd, ext2_loff_t offset, int origin)
 
 #ifndef __i386__
        retval = _llseek(fd, ((unsigned long long) offset) >> 32,
-#else                    
+#else
        retval = syscall(__NR__llseek, fd, (unsigned long long) (offset >> 32),
 #endif
                          ((unsigned long long) offset) & 0xffffffff,
@@ -82,25 +87,22 @@ static ext2_loff_t my_llseek (int fd, ext2_loff_t offset, int origin)
        return (retval == -1 ? (ext2_loff_t) retval : result);
 }
 
-#endif /* __alpha__ || __ia64__ */
+#endif /* SIZE_LONG == SIZEOF_LONG_LONG */
 
 #endif /* HAVE_LLSEEK */
 #endif /* defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE) */
 
 ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
 {
+#if SIZEOF_OFF_T >= SIZEOF_LONG_LONG
+       return my_llseek (fd, offset, origin);
+#else
        ext2_loff_t result;
        static int do_compat = 0;
 
-       if ((sizeof(off_t) >= sizeof(ext2_loff_t)) ||
-           (offset < ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1))))
-               return lseek(fd, (off_t) offset, origin);
+       if (do_compat)
+               goto fallback;
 
-       if (do_compat) {
-               errno = EINVAL;
-               return -1;
-       }
-       
        result = my_llseek (fd, offset, origin);
        if (result == -1 && errno == ENOSYS) {
                /*
@@ -108,9 +110,14 @@ ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
                 * which does not support the llseek system call
                 */
                do_compat++;
+       fallback:
+               if (offset < ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1)))
+                       return lseek(fd, (off_t) offset, origin);
                errno = EINVAL;
+               return -1;
        }
        return result;
+#endif
 }
 
 #else /* !linux */