Changeset 4041Tweet

Timestamp:

Nov 26, 2009, 2:13:58 AM (11 years ago)

Author:

Sam Hocevar

Message:

Use fseeko64() everywhere when possible, instead of potential 32-bit versions.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• msvc/config.h (modified) (2 diffs)
• src/lib-stream.c (modified) (11 diffs)

zzuf/trunk/configure.ac

@@ -49 +49 @@
 
 AC_CHECK_FUNCS(setenv waitpid setrlimit gettimeofday fork kill pipe _pipe)
-AC_CHECK_FUNCS(open64 __open64 lseek64 __lseek64 mmap64 fopen64 __fopen64 freopen64 __freopen64 dup dup2 fseeko fseeko64 __fseeko64 fsetpos64 __fsetpos64 _IO_getc getline getdelim __getdelim fgetln __srefill __filbuf __srget __uflow map_fd memalign posix_memalign aio_read accept bind connect socket readv pread recv recvfrom recvmsg mmap valloc sigaction getpagesize getc_unlocked getchar_unlocked fgetc_unlocked fread_unlocked fgets_unlocked)
+AC_CHECK_FUNCS(open64 __open64 lseek64 __lseek64 mmap64 fopen64 __fopen64 freopen64 __freopen64 dup dup2 ftello ftello64 __ftello64 fseeko fseeko64 __fseeko64 fsetpos64 __fsetpos64 _IO_getc getline getdelim __getdelim fgetln __srefill __filbuf __srget __uflow map_fd memalign posix_memalign aio_read accept bind connect socket readv pread recv recvfrom recvmsg mmap valloc sigaction getpagesize getc_unlocked getchar_unlocked fgetc_unlocked fread_unlocked fgets_unlocked)
 
 AC_CHECK_TYPES(sighandler_t, [], [],

zzuf/trunk/msvc/config.h

@@ -43 +43 @@
 #define HAVE_FSEEKO64 1
 /* #undef HAVE_FSETPOS64 */
+/* #undef HAVE_FTELLO */
+#define HAVE_FTELLO64 1
 /* #undef HAVE_GETCHAR_UNLOCKED */
 /* #undef HAVE_GETC_UNLOCKED */
@@ -107 +109 @@
 /* #undef HAVE___FSEEKO64 */
 /* #undef HAVE___FSETPOS64 */
+/* #undef HAVE___FTELLO64 */
 /* #undef HAVE___GETDELIM */
 /* #undef HAVE___LSEEK64 */

zzuf/trunk/src/lib-stream.c

@@ -29 +29 @@
 #elif defined HAVE___FILBUF || defined HAVE___SRGET || defined HAVE___UFLOW
 #   define HAVE_BSD_STDIO
+#endif
+
+/* Define the best ftell() clone */
+#if defined HAVE_FTELLO64
+#   define MYFTELL ftello64
+#elif defined HAVE___FTELLO64
+#   define MYFTELL __ftello64
+#elif defined HAVE_FTELLO
+#   define MYFTELL ftello
+#else
+#   define MYFTELL ftell
 #endif
 
@@ -296 +307 @@
 
 #if defined HAVE_DARWIN_STDIO /* Don't fuzz or seek if we have __srefill() */
-#   define FSEEK_FUZZ(myftell)
-#else
-#   define FSEEK_FUZZ(myftell) \
+#   define FSEEK_FUZZ()
+#else
+#   define FSEEK_FUZZ() \
         if(ret == 0) \
         { \
@@ -305 +316 @@
             { \
                 case SEEK_END: \
-                    offset = myftell(stream); \
+                    offset = MYFTELL(stream); \
                     /* fall through */ \
                 case SEEK_SET: \
@@ -317 +328 @@
 #endif
 
-#define FSEEK(myfseek, myftell) \
+#define FSEEK(myfseek) \
     do \
     { \
@@ -331 +342 @@
         debug("%s([%i], %lli, %i) = %i", __func__, \
               fd, (long long int)offset, whence, ret); \
-        FSEEK_FUZZ(myftell) \
+        FSEEK_FUZZ() \
         DEBUG_STREAM("new", stream); \
     } while(0)
@@ -337 +348 @@
 int NEW(fseek)(FILE *stream, long offset, int whence)
 {
-    int ret; FSEEK(fseek, ftell); return ret;
+    int ret; FSEEK(fseek); return ret;
 }
 
@@ -343 +354 @@
 int NEW(fseeko)(FILE *stream, off_t offset, int whence)
 {
-    int ret; FSEEK(fseeko, ftello); return ret;
+    int ret; FSEEK(fseeko); return ret;
 }
 #endif
@@ -350 +361 @@
 int NEW(fseeko64)(FILE *stream, off64_t offset, int whence)
 {
-    int ret; FSEEK(fseeko64, ftello64); return ret;
+    int ret; FSEEK(fseeko64); return ret;
 }
 #endif
@@ -357 +368 @@
 int NEW(__fseeko64)(FILE *stream, off64_t offset, int whence)
 {
-    int ret; FSEEK(__fseeko64, ftello); return ret;
+    int ret; FSEEK(__fseeko64); return ret;
 }
 #endif
@@ -462 +473 @@
     do \
     { \
-        int64_t newpos = ftell(stream); \
+        int64_t newpos = MYFTELL(stream); \
         /* XXX: the number of bytes read is not ret * size, because \
          * a partial read may have advanced the stream pointer. However, \
@@ -515 +526 @@
             return ORIG(myfread)(ptr, size, nmemb, stream); \
         DEBUG_STREAM("old", stream); \
-        oldpos = ftell(stream); \
+        oldpos = MYFTELL(stream); \
         _zz_lock(fd); \
         ret = ORIG(myfread)(ptr, size, nmemb, stream); \