refresh

diff --git a/meta b/meta
index 574771aa3449f69cb2366dcf129b1fb7e3927df6..c6e898a20d6f0b3fb687a3a2f6410b109701bd9a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 8e236e96afe85185d2d17cb045485bff6517044f
-Head: a8d3ae05d0c60527f97513e041d61a3b0db89799
+Previous: 39b1b528b2c28db4b9372b07b6b44e5cd08f9942
+Head: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
 Applied:
-  real-close: 1f27d8419b7b2503f997c75c64a548050e0d5712
-  refresh-temp: a8d3ae05d0c60527f97513e041d61a3b0db89799
+  real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
 Unapplied:
   dup2: bb9d29b2fc3c8906fcc7a0b205e9130a60fc16f2
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/real-close b/patches/real-close
index ab8e7ddde48f5521a4061b24e6092e19a139b66c..4a215d93cde20dc1ea4884a134d9d5e7200c95c4 100644 (file)
--- a/patches/real-close
+++ b/patches/real-close
@@ -1,5 +1,5 @@
 Bottom: d24dd0fae6823a86b3a40de76ff29ff00831ae09
-Top:    d24dd0fae6823a86b3a40de76ff29ff00831ae09
+Top:    c4f9e56fde30641b69e81060e3981b0df33f49c2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-01 16:26:11 -0700
 
@@ -15,4 +15,25 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index 52eaf1a..a680143 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -131,7 +131,7 @@ static int fd_open(void)
+       return index;
+ 
+ err2:
+-      close(index);
++      real.close(index);
+ err1:
+       free(fdi);
+       return ret;
+@@ -187,7 +187,7 @@ static enum fd_type fd_close(int index, int *fd)
+               idm_clear(&idm, index);
+               *fd = fdi->fd;
+               type = fdi->type;
+-              close(index);
++              real.close(index);
+               free(fdi);
+       } else {
+               *fd = index;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2d8bec5..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: d24dd0fae6823a86b3a40de76ff29ff00831ae09
-Top:    c4f9e56fde30641b69e81060e3981b0df33f49c2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-01 16:27:33 -0700
-
-Refresh of real-close
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 52eaf1a..a680143 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -131,7 +131,7 @@ static int fd_open(void)
-       return index;
- 
- err2:
--      close(index);
-+      real.close(index);
- err1:
-       free(fdi);
-       return ret;
-@@ -187,7 +187,7 @@ static enum fd_type fd_close(int index, int *fd)
-               idm_clear(&idm, index);
-               *fd = fdi->fd;
-               type = fdi->type;
--              close(index);
-+              real.close(index);
-               free(fdi);
-       } else {
-               *fd = index;