Changeset 1631 for zzuf/trunkTweet

Timestamp:

Jan 9, 2007, 11:02:57 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Implement map_fd for OS X.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• doc/zzuf.1 (modified) (1 diff)
• src/load-fd.c (modified) (4 diffs)

zzuf/trunk/configure.ac

@@ -15 +15 @@
 AC_PROG_LIBTOOL
 
-AC_CHECK_HEADERS(inttypes.h stdint.h getopt.h)
-AC_CHECK_FUNCS(open64 lseek64 mmap64 fopen64 fseeko _IO_getc getline getdelim __getdelim fgetln __srefill)
+AC_CHECK_HEADERS(inttypes.h stdint.h getopt.h libc.h)
+AC_CHECK_FUNCS(open64 lseek64 mmap64 fopen64 fseeko _IO_getc getline getdelim __getdelim fgetln __srefill map_fd)
 AC_CHECK_TYPES(sighandler_t, [], [],
   [#define _GNU_SOURCE

zzuf/trunk/doc/zzuf.1

@@ -282 +282 @@
 \fBfgetln\fR(), \fB__srefill\fR()
 .TP
+Mac OS X-specific:
+\fBmap_fd\fR()
+.TP
 Signal handling:
 \fBsignal\fR(), \fBsigaction\fR()

zzuf/trunk/src/load-fd.c

@@ -39 +39 @@
 #include <fcntl.h>
 #include <stdarg.h>
+#if defined HAVE_LIBC_H
+#   include <libc.h>
+#endif
 
 #include "libzzuf.h"
@@ -72 +75 @@
 #endif
 static int     (*munmap_orig)  (void *start, size_t length);
+#ifdef HAVE_MAP_FD
+static kern_return_t (*map_fd_orig) (int fd, vm_offset_t offset,
+                                     vm_offset_t *addr, boolean_t find_space,
+                                     vm_size_t numbytes);
+#endif
 static int     (*close_orig)   (int fd);
 
@@ -93 +101 @@
 #endif
     LOADSYM(munmap);
+#ifdef HAVE_MAP_FD
+    LOADSYM(map_fd);
+#endif
     LOADSYM(close);
 }
@@ -306 +317 @@
 }
 
+#ifdef HAVE_MAP_FD
+kern_return_t map_fd(int fd, vm_offset_t offset, vm_offset_t *addr,
+                     boolean_t find_space, vm_size_t numbytes)
+{
+    kern_return_t ret;
+
+    if(!_zz_ready)
+        LOADSYM(map_fd);
+    ret = map_fd_orig(fd, offset, addr, find_space, numbytes);
+    if(!_zz_ready || !_zz_iswatched(fd) || _zz_disabled)
+        return ret;
+
+    if(ret == 0)
+    {
+        void *tmp = malloc(numbytes);
+        memcpy(tmp, (void *)*addr, numbytes);
+        _zz_fuzz(fd, tmp, numbytes);
+        *addr = (vm_offset_t)tmp;
+        /* FIXME: the map is never freed; there is no such thing as unmap_fd,
+         * but I suppose that kind of map should go when the filedesciptor is
+         * closed (unlike mmap, which returns a persistent buffer). */
+    }
+
+    debug("map_fd(%i, %lli, &%p, %i, %lli) = %i", fd, (long long int)offset,
+          (void *)*addr, (int)find_space, (long long int)numbytes, ret);
+
+    return ret;
+}
+#endif
+
 int close(int fd)
 {