--- IO-AIO/AIO.xs	2012/08/24 15:33:40	1.222
+++ IO-AIO/AIO.xs	2015/02/11 19:32:36	1.231
@@ -21,7 +21,11 @@
 # include <sys/mman.h>
 #endif
 
-#if __linux__
+/* the incompetent fool that created musl keeps __linux__, refuses
+ * to implement any linux standard apis, and also has no way to test
+ * for his broken iplementation. on't complain if this fails for you.
+ */
+#if __linux__ && (defined __GLIBC__ || defined __UCLIBC__)
 # include <linux/fs.h>
 # ifdef FS_IOC_FIEMAP
 #  include <linux/types.h>
@@ -155,7 +159,7 @@
 # define minor(dev) ((dev) & 0xff)
 #endif
 
-#ifndef PAGESIZE
+#if PAGESIZE <= 0
 # define PAGESIZE sysconf (_SC_PAGESIZE)
 #endif
 
@@ -191,7 +195,7 @@
   fiemap->fm_flags        = req->int2;
   fiemap->fm_extent_count = count;
 
-  if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap))
+  if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap) < 0)
     return;
 
   if (req->int3 >= 0 /* not autosizing */
@@ -200,7 +204,7 @@
     goto done;
 
   /* else we have to loop -
-   * it would be tempting (atcually I tried that first) to just query the
+   * it would be tempting (actually I tried that first) to just query the
    * number of extents needed, but linux often feels like not returning all
    * extents, without telling us it left any out. this complicates
    * this quite a bit.
@@ -220,9 +224,12 @@
       incmap->fm_flags        = fiemap->fm_flags;
       incmap->fm_extent_count = (sizeof (scratch) - sizeof (struct fiemap)) / sizeof (struct fiemap_extent);
 
-      if (ioctl (req->int1, FS_IOC_FIEMAP, incmap))
+      if (ioctl (req->int1, FS_IOC_FIEMAP, incmap) < 0)
         return;
 
+      if (!incmap->fm_mapped_extents)
+        goto done;
+
       count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents;
       fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
       errno = ENOMEM;
@@ -303,7 +310,7 @@
 static SV *
 newSVaio_wd (aio_wd wd)
 {
-  return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
+  return sv_bless (newRV_noinc (newSViv ((intptr_t)wd)), aio_wd_stash);
 }
 
 static aio_req
@@ -509,6 +516,11 @@
                 {
                   EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
                   HV *hv = newHV ();
+                  /* POSIX requires fsid to be unsigned long, but AIX in its infinite wisdom
+                   * chooses to make it a struct.
+                   */
+                  unsigned long fsid = 0;
+                  memcpy (&fsid, &f->f_fsid, sizeof (unsigned long) < sizeof (f->f_fsid) ? sizeof (unsigned long) : sizeof (f->f_fsid));
 
                   rv = sv_2mortal (newRV_noinc ((SV *)hv));
 
@@ -520,7 +532,7 @@
                   hv_store (hv, "files"  , sizeof ("files"  ) - 1, newSVval64 (f->f_files  ), 0);
                   hv_store (hv, "ffree"  , sizeof ("ffree"  ) - 1, newSVval64 (f->f_ffree  ), 0);
                   hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
-                  hv_store (hv, "fsid"   , sizeof ("fsid"   ) - 1, newSVval64 (f->f_fsid   ), 0);
+                  hv_store (hv, "fsid"   , sizeof ("fsid"   ) - 1, newSVval64 (fsid        ), 0);
                   hv_store (hv, "flag"   , sizeof ("flag"   ) - 1, newSVval64 (f->f_flag   ), 0);
                   hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
                 }
@@ -1254,9 +1266,8 @@
         else
           {
             /* read: check type and grow scalar as necessary */
-            SvUPGRADE (data, SVt_PV);
-            if (SvLEN (data) >= SvCUR (data))
-              svptr = SvGROW (data, len + dataoffset + 1);
+            if (!SvPOK (data) || SvLEN (data) >= SvCUR (data))
+              svptr = sv_grow (data, len + dataoffset + 1);
             else if (SvCUR (data) < len + dataoffset)
               croak ("length + dataoffset outside of scalar, and cannot grow");
           }
@@ -1610,7 +1621,10 @@
 
         req->type = EIO_GROUP;
 
+        PUTBACK;
         req_submit (req);
+        SPAGAIN;
+
         XPUSHs (req_sv (req, aio_grp_stash));
 }
 
@@ -1729,7 +1743,7 @@
         RETVAL
 
 void
-mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
+mmap (SV *scalar, STRLEN length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
 	PPCODE:
         sv_unmagic (scalar, MMAP_MAGIC);
 {
@@ -1766,14 +1780,14 @@
         sv_unmagic (scalar, MMAP_MAGIC);
 
 int
-madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
+madvise (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
 	ALIAS:
         mprotect = 1
         CODE:
 {
 	STRLEN svlen;
 	void *addr = SvPVbyte (scalar, svlen);
-        size_t len = SvUV (length);
+        STRLEN len = SvUV (length);
 
         if (offset < 0)
           offset += svlen;
@@ -1797,7 +1811,7 @@
         RETVAL
 
 int
-munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
+munlock (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef)
         CODE:
 {
 	STRLEN svlen;
@@ -1864,6 +1878,22 @@
 	OUTPUT:
         RETVAL
 
+int
+pipesize (aio_rfd rfh, int new_size = -1)
+	PROTOTYPE: $;$
+        CODE:
+#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ)
+        if (new_size >= 0)
+          RETVAL = fcntl (rfh, F_SETPIPE_SZ, new_size);
+        else
+          RETVAL = fcntl (rfh, F_GETPIPE_SZ);
+#else
+        errno = ENOSYS;
+        RETVAL = -1;
+#endif
+        OUTPUT:
+        RETVAL
+
 void _on_next_submit (SV *cb)
 	CODE:
         SvREFCNT_dec (on_next_submit);