refresh

diff --git a/meta b/meta
index 09c6bc44bc59ba7b39f0ec48d577283a79198ae9..793712876277d578b9639f14a8025f5472996c90 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 332b2aac9428f99cc18f81a28d439ea9a9b20a49
-Head: e431a9f38cba677851469cf8376b13629d44cde7
+Previous: 24808d4b2cd24c13d0194988c2efeb8dcc071a50
+Head: 05f560a29b84296921b236dcd1fb65b73b6e6280
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: 1df5d0ba001a0777074e6ab8ca215762b9431b53
-  fstat: d1ef238625c2054a05c0376decf141aee16b428d
-  refresh-temp: e431a9f38cba677851469cf8376b13629d44cde7
+  fstat: 05f560a29b84296921b236dcd1fb65b73b6e6280
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/fstat b/patches/fstat
index 08ac1e18e4fae320191ef3a93f0e5c4f4adea0f5..abb094ecacdf5df9da5d11689ccaf17c3964f2a0 100644 (file)
--- a/patches/fstat
+++ b/patches/fstat
@@ -1,5 +1,5 @@
 Bottom: fdd492cdb13406bafcf14c37b554b2de76a99d5b
-Top:    fdd492cdb13406bafcf14c37b554b2de76a99d5b
+Top:    a70e486d7fb3d18adace33aea325353d847f6b41
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 09:37:24 -0700
 
@@ -12,4 +12,41 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index 085e8b4..b9c32e6 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);
+ };
+ 
+ static struct socket_calls real;
+@@ -259,6 +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");
+ 
+       rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
+       rs.bind = dlsym(RTLD_DEFAULT, "rbind");
+@@ -960,3 +962,17 @@ int dup2(int oldfd, int newfd)
+       atomic_inc(&oldfdi->refcnt);
+       return newfd;
+ }
++
++int fstat(int socket, struct stat *buf)
++{
++      int fd, ret;
++
++      if (fd_get(socket, &fd) == fd_rsocket) {
++              ret = real.fstat(socket, buf);
++              if (!ret)
++                      buf->st_mode |= __S_IFSOCK;
++      } else {
++              ret = real.fstat(fd, buf);
++      }
++      return ret;
++}

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 91ac472..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,47 +0,0 @@
-Bottom: fdd492cdb13406bafcf14c37b554b2de76a99d5b
-Top:    a70e486d7fb3d18adace33aea325353d847f6b41
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 10:30:05 -0700
-
-Refresh of fstat
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 085e8b4..b9c32e6 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);
- };
- 
- static struct socket_calls real;
-@@ -259,6 +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");
- 
-       rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
-       rs.bind = dlsym(RTLD_DEFAULT, "rbind");
-@@ -960,3 +962,17 @@ int dup2(int oldfd, int newfd)
-       atomic_inc(&oldfdi->refcnt);
-       return newfd;
- }
-+
-+int fstat(int socket, struct stat *buf)
-+{
-+      int fd, ret;
-+
-+      if (fd_get(socket, &fd) == fd_rsocket) {
-+              ret = real.fstat(socket, buf);
-+              if (!ret)
-+                      buf->st_mode |= __S_IFSOCK;
-+      } else {
-+              ret = real.fstat(fd, buf);
-+      }
-+      return ret;
-+}