Changeset 1678

Timestamp:

01/16/07 15:21:28 (6 years ago)

Author:

sam

Message:

• pread() implementation, thanks to Clément Stenac.

Location:

zzuf/trunk

Files:

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

zzuf/trunk/AUTHORS

@@ -6 +6 @@
 other contributors:
  Rémi Denis-Courmont <rdenis#simphalempin:com> (readv support)
+ Clément Stenac <zorglub#diwi:org> (pread support)
 

zzuf/trunk/doc/zzuf.1

@@ -318 +318 @@
 .TP
 Unix file descriptor handling:
-\fBopen\fR(), \fBlseek\fR(), \fBread\fR(), \freadv\fR(), \fBaccept\fR(),
-\fBsocket\fR(), \fBclose\fR()
+\fBopen\fR(), \fBlseek\fR(), \fBread\fR(), \fBreadv\fR(), \fBpread\fR(),
+\fBaccept\fR(), \fBsocket\fR(), \fBclose\fR()
 .TP
 Standard IO streams:

zzuf/trunk/src/load-fd.c

@@ -3 +3 @@
  *  Copyright (c) 2006, 2007 Sam Hocevar <sam@zoy.org>
  *                2007 Rémi Denis-Courmont <rdenis#simphalempin:com>
+ *                2007 Clément Stenac <zorglub#diwi:org>
  *                All Rights Reserved
  *
@@ -63 +64 @@
 static ssize_t (*read_orig)    (int fd, void *buf, size_t count);
 static ssize_t (*readv_orig)   (int fd, const struct iovec *iov, int count);
+static ssize_t (*pread_orig)   (int fd, void *buf, size_t count, off_t offset);
 static off_t   (*lseek_orig)   (int fd, off_t offset, int whence);
 #ifdef HAVE_LSEEK64
@@ -79 +81 @@
     LOADSYM(socket);
     LOADSYM(read);
+    LOADSYM(readv);
+    LOADSYM(pread);
     LOADSYM(lseek);
 #ifdef HAVE_LSEEK64
@@ -238 +242 @@
 }
 
+ssize_t pread(int fd, void *buf, size_t count, off_t offset)
+{
+    int ret;
+
+    LOADSYM(pread);
+    ret = pread_orig(fd, buf, count, offset);
+    if(!_zz_ready || !_zz_iswatched(fd) || _zz_disabled)
+        return ret;
+
+    if(ret > 0)
+    {
+        long int curoff = _zz_getpos(fd);
+        char *b = buf;
+
+        _zz_setpos(fd, offset);
+        _zz_fuzz(fd, buf, ret);
+        _zz_setpos(fd, curoff);
+
+        if(ret >= 4)
+            debug("pread(%i, %p, %li, %li) = %i \"%c%c%c%c...", fd, buf,
+                  (long int)count, (long int)offset, ret,
+                  b[0], b[1], b[2], b[3]);
+        else
+            debug("pread(%i, %p, %li, %li) = %i \"%c...", fd, buf,
+                  (long int)count, (long int)offset, ret, b[0]);
+    }
+    else
+        debug("pread(%i, %p, %li, %li) = %i", fd, buf,
+              (long int)count, (long int)offset, ret);
+
+    return ret;
+}
+
 #define LSEEK(fn, off_t) \
     do \