refresh

diff --git a/meta b/meta
index 465fbda69827d20d973275b213922a15f01e9760..3eccb6c6b99e0a7c448418f733fcfd30c605c6a0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 11f3e93de5e27dae10421d764b6366d381ba9978
-Head: 3a0b3dd6ffac5f14605f952298dba01a6f846d37
+Previous: 2ec33b4a2a0c11b128ae1bd26e196e8ac2f9f747
+Head: 332b5e4db811019600b165f03de1cd0326c94952
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: 1df5d0ba001a0777074e6ab8ca215762b9431b53
   fstat: b3146de2e39672cc98915604e2bc94dd98312356
-  dbg-out: 0681cbfc282dbccb39d9b801460c82e1aac9b425
-  refresh-temp: 3a0b3dd6ffac5f14605f952298dba01a6f846d37
+  dbg-out: 332b5e4db811019600b165f03de1cd0326c94952
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index a55864d44073c531b54c391fd01f4321ca18a802..8450d82a6cc07bde58c659ef535303cd6045f9de 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 799d9bfcd5b6545c40e5e19c7b50907bd25ed616
-Top:    427327f6d7f80a4a3fd819feac923c9113a18154
+Top:    1db36b1ec8bc6cb382c9b444bf6057015721abf3
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 11:08:30 -0700
 
@@ -9,7 +9,7 @@ support for debug prints
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 749857e..d606273 100644
+index 749857e..3e524b4 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -37,10 +37,16 @@ index 749857e..d606273 100644
        getenv_options();
        init = 1;
  out:
-@@ -967,12 +971,16 @@ int fstat(int socket, struct stat *buf)
+@@ -963,16 +967,21 @@ int dup2(int oldfd, int newfd)
+       return newfd;
+ }
+ 
+-int fstat(int socket, struct stat *buf)
++int __fxstat64(int ver, int socket, struct stat *buf)
  {
        int fd, ret;
  
++      init_preload();
 +      fprintf(fout, "fstat socket %d\n", socket);
        if (fd_get(socket, &fd) == fd_rsocket) {
                ret = real.fstat(socket, buf);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 30a37fb..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 427327f6d7f80a4a3fd819feac923c9113a18154
-Top:    1db36b1ec8bc6cb382c9b444bf6057015721abf3
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 13:53:29 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index d606273..3e524b4 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -967,10 +967,11 @@ int dup2(int oldfd, int newfd)
-       return newfd;
- }
- 
--int fstat(int socket, struct stat *buf)
-+int __fxstat64(int ver, int socket, struct stat *buf)
- {
-       int fd, ret;
- 
-+      init_preload();
-       fprintf(fout, "fstat socket %d\n", socket);
-       if (fd_get(socket, &fd) == fd_rsocket) {
-               ret = real.fstat(socket, buf);