refresh

diff --git a/meta b/meta
index c5371d75524f87951f5834747d2284b5e46aa0d1..cd226cd5ee6d7983a1e1354567ac1cfb2d880262 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: db4853b1e12232b4e223fcad3c4b1e8579a20e0a
-Head: 96a2438d7e1bde7d8023d90974ef7c20857a9010
+Previous: 088c0bd8ef3702d0c1502b34529a47afd29b3854
+Head: 145e9c03553f4d2a6f4b6217435fb22147f8e57e
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
   af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
   ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
-  dup2: ddf59ea4c84ee46d1d22e19d18c9a75ebddab8e8
-  refresh-temp: 96a2438d7e1bde7d8023d90974ef7c20857a9010
+  dup2: 145e9c03553f4d2a6f4b6217435fb22147f8e57e
 Unapplied:
   addrinfo-af-ib: cd7d0a0ee1c2855bbeddd308948c50c884eec6d8
   addrtype: 066c2615bf5399848088a9771093a76c5e205bf1

diff --git a/patches/dup2 b/patches/dup2
index 48bb72c74346fbc66db9b8f0e41c58c16caf669e..65cb3b81dfd439076e23bd54c1c8d8b9f1d11e74 100644 (file)
--- a/patches/dup2
+++ b/patches/dup2
@@ -1,5 +1,5 @@
 Bottom: 4e01eb8a1c0681cd7bcca9c1bf3502036b929d4b
-Top:    4e01eb8a1c0681cd7bcca9c1bf3502036b929d4b
+Top:    79d073d6c2d4883bac75c2245a0da053def1f1d6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-07 10:20:53 -0700
 
@@ -10,4 +10,22 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index 4ba38f5..fb2149b 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -978,8 +978,12 @@ int dup2(int oldfd, int newfd)
+ 
+       init_preload();
+       oldfdi = idm_lookup(&idm, oldfd);
+-      if (oldfdi && oldfdi->type == fd_fork)
+-              fork_passive(oldfd);
++      if (oldfdi) {
++              if (oldfdi->state == fd_fork_passive)
++                      fork_passive(oldfd);
++              else if (oldfdi->state == fd_fork_active)
++                      fork_active(oldfd);
++      }
+ 
+       newfdi = idm_lookup(&idm, newfd);
+       if (newfdi) {

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 97699eb..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,28 +0,0 @@
-Bottom: 4e01eb8a1c0681cd7bcca9c1bf3502036b929d4b
-Top:    79d073d6c2d4883bac75c2245a0da053def1f1d6
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-07 10:25:21 -0700
-
-Refresh of dup2
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 4ba38f5..fb2149b 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -978,8 +978,12 @@ int dup2(int oldfd, int newfd)
- 
-       init_preload();
-       oldfdi = idm_lookup(&idm, oldfd);
--      if (oldfdi && oldfdi->type == fd_fork)
--              fork_passive(oldfd);
-+      if (oldfdi) {
-+              if (oldfdi->state == fd_fork_passive)
-+                      fork_passive(oldfd);
-+              else if (oldfdi->state == fd_fork_active)
-+                      fork_active(oldfd);
-+      }
- 
-       newfdi = idm_lookup(&idm, newfd);
-       if (newfdi) {