Changeset 1730Tweet

Timestamp:

Feb 1, 2007, 7:19:03 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Fixed a few 64-bit issues reported by MSVC.
• More Win32 portability fixes.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• msvc/config.h (modified) (2 diffs)
• src/debug.c (modified) (1 diff)
• src/fd.c (modified) (4 diffs)
• src/fd.h (modified) (1 diff)
• src/fuzz.c (modified) (2 diffs)
• src/lib-mem.c (modified) (1 diff)
• src/lib-stream.c (modified) (1 diff)
• src/libzzuf.c (modified) (1 diff)

zzuf/trunk/configure.ac

@@ -28 +28 @@
 AC_SUBST(DLL_LDFLAGS)
 
-AC_CHECK_HEADERS(windows.h winsock2.h io.h unistd.h inttypes.h stdint.h getopt.h libc.h malloc.h dlfcn.h regex.h sys/socket.h sys/uio.h aio.h sys/mman.h sys/wait.h sys/resource.h sys/time.h)
+AC_CHECK_HEADERS(windows.h winsock2.h io.h process.h unistd.h inttypes.h stdint.h getopt.h libc.h malloc.h dlfcn.h regex.h sys/socket.h sys/uio.h aio.h sys/mman.h sys/wait.h sys/resource.h sys/time.h)
 
 AC_CHECK_FUNCS(setenv waitpid setrlimit gettimeofday fork kill pipe _pipe)

zzuf/trunk/msvc/config.h

@@ -22 +22 @@
 #define HAVE_WINSOCK2_H 1
 #define HAVE_IO_H 1
+#define HAVE_PROCESS_H 1
+
+#define HAVE__PIPE
 
 /* Win32-specific, of course. */
@@ -34 +37 @@
 
 typedef unsigned long int uintptr_t;
-typedef long int intptr_t;
 typedef int pid_t;
 

zzuf/trunk/src/debug.c

@@ -30 +30 @@
 #if defined HAVE_UNISTD_H
 #   include <unistd.h>
+#endif
+#if defined HAVE_IO_H
+#   include <io.h>
 #endif
 #include <errno.h>

zzuf/trunk/src/fd.c

@@ -51 +51 @@
 {
     int managed, locked;
-    uint64_t pos;
+    int64_t pos;
     /* Public stuff */
     struct fuzz fuzz;
@@ -312 +312 @@
 }
 
-long int _zz_getpos(int fd)
+int64_t _zz_getpos(int fd)
 {
     if(fd < 0 || fd >= maxfd || fds[fd] == -1)
@@ -320 +320 @@
 }
 
-void _zz_setpos(int fd, long int pos)
+void _zz_setpos(int fd, int64_t pos)
 {
     if(fd < 0 || fd >= maxfd || fds[fd] == -1)
@@ -328 +328 @@
 }
 
-void _zz_addpos(int fd, long int off)
+void _zz_addpos(int fd, int64_t off)
 {
     if(fd < 0 || fd >= maxfd || fds[fd] == -1)

zzuf/trunk/src/fd.h

@@ -33 +33 @@
 extern void _zz_unlock(int);
 extern int _zz_islocked(int);
-extern long int _zz_getpos(int);
-extern void _zz_setpos(int, long int);
-extern void _zz_addpos(int, long int);
+extern int64_t _zz_getpos(int);
+extern void _zz_setpos(int, int64_t);
+extern void _zz_addpos(int, int64_t);
 extern struct fuzz *_zz_getfuzz(int);
 

zzuf/trunk/src/fuzz.c

@@ -112 +112 @@
 void _zz_fuzz(int fd, volatile uint8_t *buf, uint64_t len)
 {
-    uint64_t start, stop;
+    int64_t start, stop;
+    int64_t pos = _zz_getpos(fd);
     struct fuzz *fuzz;
     volatile uint8_t *aligned_buf;
-    unsigned long int pos = _zz_getpos(fd);
-    unsigned int i, j, todo;
+    int i, j, todo;
 
 #if 0
-    debug("fuzz(%i, %lli@%li)", fd, (unsigned long long int)len,
-          (unsigned long int)pos);
+    debug("fuzz(%i, %lli@%lli)", fd, (long long int)len,
+          (long long int)pos);
 #endif
 
@@ -160 +160 @@
         for(j = start; j < stop; j++)
         {
-            unsigned int *r;
+            int *r;
             uint8_t byte, fuzzbyte;
 

zzuf/trunk/src/lib-mem.c

@@ -101 +101 @@
 #define DUMMY_BYTES 655360 /* 640 kB ought to be enough for anybody */
 static uint64_t dummy_buffer[DUMMY_BYTES / 8];
-static int dummy_offset = 0;
+static int64_t dummy_offset = 0;
 #define DUMMY_START ((uintptr_t)dummy_buffer)
 #define DUMMY_STOP ((uintptr_t)dummy_buffer + DUMMY_BYTES)

zzuf/trunk/src/lib-stream.c

@@ -224 +224 @@
 size_t NEW(fread)(void *ptr, size_t size, size_t nmemb, FILE *stream)
 {
-    long int pos;
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
-#else
-    long int newpos;
+    int64_t pos;
+#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
+#else
+    int64_t newpos;
 #endif
     size_t ret;

zzuf/trunk/src/libzzuf.c

@@ -27 +27 @@
 #if defined HAVE_WINDOWS_H
 #   include <windows.h>
+#endif
+#if defined HAVE_PROCESS_H
+#   include <process.h>
 #endif
 #include <stdio.h>