--- IO-AIO/AIO.xs	2015/06/13 00:06:13	1.232
+++ IO-AIO/AIO.xs	2015/06/25 13:34:28	1.233
@@ -341,6 +341,31 @@
   return (aio_wd)(long)SvIVX (SvRV (sv));
 }
 
+static SV *
+newmortalFH (int fd, int flags)
+{
+  if (fd < 0)
+    return &PL_sv_undef;
+
+  GV *gv = (GV *)sv_newmortal ();
+  char sym[64];
+  int symlen;
+  
+  symlen = snprintf (sym, sizeof (sym), "fd#%d", fd);
+  gv_init (gv, aio_stash, sym, symlen, 0);
+
+  symlen = snprintf (
+     sym,
+     sizeof (sym),
+     "%s&=%d",
+     flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
+     fd
+  );
+
+  return do_open (gv, sym, symlen, 0, 0, 0, 0)
+         ? (SV *)gv : &PL_sv_undef;
+}
+
 static void
 aio_grp_feed (aio_req grp)
 {
@@ -476,34 +501,7 @@
             break;
 
           case EIO_OPEN:
-            {
-              /* convert fd to fh */
-              SV *fh = &PL_sv_undef;
-
-              if (req->result >= 0)
-                {
-                  GV *gv = (GV *)sv_newmortal ();
-                  int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
-                  char sym [64];
-                  int symlen;
-                  
-                  symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
-                  gv_init (gv, aio_stash, sym, symlen, 0);
-
-                  symlen = snprintf (
-                     sym,
-                     sizeof (sym),
-                     "%s&=%d",
-                     flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
-                     (int)req->result
-                  );
-
-                  if (do_open (gv, sym, symlen, 0, 0, 0, 0))
-                    fh = (SV *)gv;
-                }
-
-              PUSHs (fh);
-            }
+            PUSHs (newmortalFH (req->result, req->int1 & (O_RDONLY | O_WRONLY | O_RDWR)));
             break;
 
           case EIO_STATVFS:
@@ -1896,6 +1894,31 @@
         OUTPUT:
         RETVAL
 
+void
+pipe2 (int flags = 0)
+	PROTOTYPE: ;$
+        PPCODE:
+{
+	int fd[2];
+        int res;
+
+        if (flags)
+#if HAVE_PIPE2
+          res = pipe2 (fd, flags);
+#else
+          res = (errno = ENOSYS, -1);
+#endif
+        else
+          res = pipe (fd);
+
+        if (!res)
+          {
+            EXTEND (SP, 2);
+            PUSHs (newmortalFH (fd[0], O_RDONLY));
+            PUSHs (newmortalFH (fd[1], O_WRONLY));
+          }
+}
+
 void _on_next_submit (SV *cb)
 	CODE:
         SvREFCNT_dec (on_next_submit);