Changeset 1494 for zzuf/trunk/src/load-stream.cTweet

Timestamp:

Dec 17, 2006, 6:17:31 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Split preload.c into load-fd.c and load-stream.c.

File:

• zzuf/trunk/src/load-stream.c (copied) (copied from zzuf/trunk/src/preload.c) (6 diffs)

zzuf/trunk/src/load-stream.c

@@ -14 +14 @@
 
 /*
- *  preload.c: preloaded library functions
+ *  load-stream.c: loaded stream functions
  */
 
@@ -21 +21 @@
 /* Can't remember what that's for */
 #define _GNU_SOURCE
-/* Use this to get lseek64() */
-#define _LARGEFILE64_SOURCE
 
 #if defined HAVE_STDINT_H
@@ -29 +27 @@
 #   include <inttypes.h>
 #endif
+#include <stdlib.h>
+#include <regex.h>
+#include <dlfcn.h>
+
 #include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <regex.h>
-
-#include <stdarg.h>
-#include <dlfcn.h>
 
 #include "libzzuf.h"
 #include "debug.h"
 #include "fuzz.h"
-#include "preload.h"
+#include "load.h"
 
 /* Library functions that we divert */
@@ -52 +46 @@
 static int     (*fclose_orig)  (FILE *fp);
 
-static int     (*open_orig)    (const char *file, int oflag, ...);
-static int     (*open64_orig)  (const char *file, int oflag, ...);
-static ssize_t (*read_orig)    (int fd, void *buf, size_t count);
-static off_t   (*lseek_orig)   (int fd, off_t offset, int whence);
-static off64_t (*lseek64_orig) (int fd, off64_t offset, int whence);
-static int     (*close_orig)   (int fd);
-
-#define STR(x) #x
-#define ORIG(x) x##_orig
-
-#define LOADSYM(x) \
-    do { \
-        ORIG(x) = dlsym(RTLD_NEXT, STR(x)); \
-        if(!ORIG(x)) \
-            abort(); \
-    } while(0)
-
-void zzuf_preload_libc(void)
+void zzuf_load_stream(void)
 {
     LOADSYM(fopen);
@@ -76 +53 @@
     LOADSYM(fread);
     LOADSYM(fclose);
-
-    LOADSYM(open);
-    LOADSYM(open64);
-    LOADSYM(read);
-    LOADSYM(lseek);
-    LOADSYM(lseek64);
-    LOADSYM(close);
 }
 
@@ -194 +164 @@
 }
 
-#define OPEN(fn) \
-    do \
-    { \
-        int mode = 0; \
-        if(!_zzuf_ready) \
-            LOADSYM(fn); \
-        if(oflag & O_CREAT) \
-        { \
-            va_list va; \
-            va_start(va, oflag); \
-            mode = va_arg(va, int); \
-            va_end(va); \
-            ret = ORIG(fn)(file, oflag, mode); \
-        } \
-        else \
-        { \
-            ret = ORIG(fn)(file, oflag); \
-        } \
-        if(!_zzuf_ready) \
-            return ret; \
-        if(ret >= 0 \
-            && ((oflag & (O_RDONLY | O_RDWR | O_WRONLY)) != O_WRONLY)) \
-        { \
-            if(_zzuf_include && \
-                regexec(_zzuf_include, file, 0, NULL, 0) == REG_NOMATCH) \
-                /* not included: ignore */ ; \
-            else if(_zzuf_exclude && \
-                    regexec(_zzuf_exclude, file, 0, NULL, 0) != REG_NOMATCH) \
-                /* excluded: ignore */ ; \
-            else \
-            { \
-                if(oflag & O_CREAT) \
-                    debug(STR(fn) "(\"%s\", %i, %i) = %i", \
-                          file, oflag, mode, ret); \
-                else \
-                    debug(STR(fn) "(\"%s\", %i) = %i", file, oflag, ret); \
-                files[ret].managed = 1; \
-                files[ret].pos = 0; \
-            } \
-        } \
-    } while(0)
-
-int open(const char *file, int oflag, ...)
-{
-    int ret; OPEN(open); return ret;
-}
-
-int open64(const char *file, int oflag, ...)
-{
-    int ret; OPEN(open64); return ret;
-}
-
-ssize_t read(int fd, void *buf, size_t count)
-{
-    int ret;
-
-    if(!_zzuf_ready)
-        LOADSYM(read);
-    ret = read_orig(fd, buf, count);
-    if(!_zzuf_ready)
-        return ret;
-
-    if(!files[fd].managed)
-        return ret;
-
-    debug("read(%i, %p, %li) = %i", fd, buf, (long int)count, ret);
-    if(ret > 0)
-    {
-        zzuf_fuzz(fd, buf, ret);
-        files[fd].pos += ret;
-    }
-
-    /* Sanity check, can be OK though (for instance with a character device) */
-    if((uint64_t)lseek64_orig(fd, 0, SEEK_CUR) != files[fd].pos)
-        debug("warning: offset inconsistency");
-
-    return ret;
-}
-
-#define LSEEK(fn, off_t) \
-    do { \
-        if(!_zzuf_ready) \
-            LOADSYM(fn); \
-        ret = ORIG(fn)(fd, offset, whence); \
-        if(!_zzuf_ready) \
-            return ret; \
-        if(!files[fd].managed) \
-            return ret; \
-        debug(STR(fn)"(%i, %lli, %i) = %lli", \
-              fd, (long long int)offset, whence, (long long int)ret); \
-        if(ret != (off_t)-1) \
-            files[fd].pos = (int64_t)ret; \
-    } while(0)
-
-off_t lseek(int fd, off_t offset, int whence)
-{
-    off_t ret;
-    LSEEK(lseek, off_t);
-    return ret;
-}
-
-off64_t lseek64(int fd, off64_t offset, int whence)
-{
-    off64_t ret;
-    LSEEK(lseek64, off64_t);
-    return ret;
-}
-
-int close(int fd)
-{
-    int ret;
-
-    if(!_zzuf_ready)
-        LOADSYM(close);
-    ret = close_orig(fd);
-    if(!_zzuf_ready)
-        return ret;
-
-    if(!files[fd].managed)
-        return ret;
-
-    debug("close(%i) = %i", fd, ret);
-    files[fd].managed = 0;
-
-    return ret;
-}
-