refresh

diff --git a/meta b/meta
index abc681b06c80fa7f8a614884f5c0ceeb27ca36e2..437e2f63f1c9483a6f7f62ad7f33ec8f1408f515 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 50dcf0cf94a073a2dbf0560bc828031c70fae979
-Head: c31174ebb1af64be4ef295169418f8fa30d41a34
+Previous: e908efbccf1a051f5760e8a1a77f30592358dd1b
+Head: 07e07a6ee41d57eb20b3b71b1d8098408fc1de03
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
-  fstat: dcd994c9e3d610f447e676429a394a496b83a2d6
-  refresh-temp: c31174ebb1af64be4ef295169418f8fa30d41a34
+  fstat: 07e07a6ee41d57eb20b3b71b1d8098408fc1de03
 Unapplied:
   dbg-out: abe42e50924367870177ad006afb6a35bf024afb
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/fstat b/patches/fstat
index f88283c8be2cbf791befc688b47bd55236ac8c02..f056b7e894584a90988a58f0c8623ad92af1b913 100644 (file)
--- a/patches/fstat
+++ b/patches/fstat
@@ -1,5 +1,5 @@
 Bottom: 7cfa8b8bbb7449eac973ab817f043b3f1a3850b7
-Top:    7bf18695fef78ce1cf020b98bda96e2687917519
+Top:    8706747d8841cecefce6c394ef08bec016dd0348
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 09:37:24 -0700
 
@@ -13,14 +13,14 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index b18d310..33eb9a3 100644
+index b18d310..53f8543 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -84,6 +84,7 @@ struct socket_calls {
                          void *optval, socklen_t *optlen);
        int (*fcntl)(int socket, int cmd, ... /* arg */);
        int (*dup2)(int oldfd, int newfd);
-+      int (*fstat)(int fd, struct stat *buf);
++      int (*fxstat64)(int ver, int fd, struct stat64 *buf);
  };
  
  static struct socket_calls real;
@@ -28,7 +28,7 @@ index b18d310..33eb9a3 100644
        real.getsockopt = dlsym(RTLD_NEXT, "getsockopt");
        real.fcntl = dlsym(RTLD_NEXT, "fcntl");
        real.dup2 = dlsym(RTLD_NEXT, "dup2");
-+      real.fstat = dlsym(RTLD_NEXT, "fstat");
++      real.fxstat64 = dlsym(RTLD_NEXT, "__fxstat64");
  
        rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
        rs.bind = dlsym(RTLD_DEFAULT, "rbind");
@@ -37,16 +37,16 @@ index b18d310..33eb9a3 100644
        return newfd;
  }
 +
-+int fstat(int socket, struct stat *buf)
++int __fxstat64(int ver, int socket, struct stat64 *buf)
 +{
 +      int fd, ret;
 +
 +      if (fd_get(socket, &fd) == fd_rsocket) {
-+              ret = real.fstat(socket, buf);
++              ret = real.fxstat64(ver, socket, buf);
 +              if (!ret)
 +                      buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
 +      } else {
-+              ret = real.fstat(fd, buf);
++              ret = real.fxstat64(ver, fd, buf);
 +      }
 +      return ret;
 +}

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ecd85d7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,51 +0,0 @@
-Bottom: 7bf18695fef78ce1cf020b98bda96e2687917519
-Top:    8706747d8841cecefce6c394ef08bec016dd0348
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 14:05:28 -0700
-
-Refresh of fstat
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 33eb9a3..53f8543 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -84,7 +84,7 @@ struct socket_calls {
-                         void *optval, socklen_t *optlen);
-       int (*fcntl)(int socket, int cmd, ... /* arg */);
-       int (*dup2)(int oldfd, int newfd);
--      int (*fstat)(int fd, struct stat *buf);
-+      int (*fxstat64)(int ver, int fd, struct stat64 *buf);
- };
- 
- static struct socket_calls real;
-@@ -260,7 +260,7 @@ static void init_preload(void)
-       real.getsockopt = dlsym(RTLD_NEXT, "getsockopt");
-       real.fcntl = dlsym(RTLD_NEXT, "fcntl");
-       real.dup2 = dlsym(RTLD_NEXT, "dup2");
--      real.fstat = dlsym(RTLD_NEXT, "fstat");
-+      real.fxstat64 = dlsym(RTLD_NEXT, "__fxstat64");
- 
-       rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
-       rs.bind = dlsym(RTLD_DEFAULT, "rbind");
-@@ -964,16 +964,16 @@ int dup2(int oldfd, int newfd)
-       return newfd;
- }
- 
--int fstat(int socket, struct stat *buf)
-+int __fxstat64(int ver, int socket, struct stat64 *buf)
- {
-       int fd, ret;
- 
-       if (fd_get(socket, &fd) == fd_rsocket) {
--              ret = real.fstat(socket, buf);
-+              ret = real.fxstat64(ver, socket, buf);
-               if (!ret)
-                       buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
-       } else {
--              ret = real.fstat(fd, buf);
-+              ret = real.fxstat64(ver, fd, buf);
-       }
-       return ret;
- }