--- IO-AIO/AIO.pm	2008/11/20 09:01:40	1.143
+++ IO-AIO/AIO.pm	2009/06/03 12:24:49	1.147
@@ -195,7 +195,7 @@
 use base 'Exporter';
 
 BEGIN {
-   our $VERSION = '3.17';
+   our $VERSION = '3.19';
 
    our @AIO_REQ = qw(aio_sendfile aio_read aio_write aio_open aio_close
                      aio_stat aio_lstat aio_unlink aio_rmdir aio_readdir
@@ -340,16 +340,20 @@
 
 =item aio_write $fh,$offset,$length, $data,$dataoffset, $callback->($retval)
 
-Reads or writes C<$length> bytes from the specified C<$fh> and C<$offset>
-into the scalar given by C<$data> and offset C<$dataoffset> and calls the
-callback without the actual number of bytes read (or -1 on error, just
-like the syscall).
+Reads or writes C<$length> bytes from or to the specified C<$fh> and
+C<$offset> into the scalar given by C<$data> and offset C<$dataoffset>
+and calls the callback without the actual number of bytes read (or -1 on
+error, just like the syscall).
+
+C<aio_read> will, like C<sysread>, shrink or grow the C<$data> scalar to
+offset plus the actual number of bytes read.
 
 If C<$offset> is undefined, then the current file descriptor offset will
 be used (and updated), otherwise the file descriptor offset will not be
 changed by these calls.
 
-If C<$length> is undefined in C<aio_write>, use the remaining length of C<$data>.
+If C<$length> is undefined in C<aio_write>, use the remaining length of
+C<$data>.
 
 If C<$dataoffset> is less than zero, it will be counted from the end of
 C<$data>.
@@ -589,7 +593,7 @@
    aioreq_pri $pri;
    add $grp aio_open $src, O_RDONLY, 0, sub {
       if (my $src_fh = $_[0]) {
-         my @stat = stat $src_fh;
+         my @stat = stat $src_fh; # hmm, might bock over nfs?
 
          aioreq_pri $pri;
          add $grp aio_open $dst, O_CREAT | O_WRONLY | O_TRUNC, 0200, sub {
@@ -600,13 +604,26 @@
                      $grp->result (0);
                      close $src_fh;
 
-                     # those should not normally block. should. should.
-                     utime $stat[8], $stat[9], $dst;
-                     chmod $stat[2] & 07777, $dst_fh;
-                     chown $stat[4], $stat[5], $dst_fh;
+                     my $ch = sub {
+                        aioreq_pri $pri;
+                        add $grp aio_chmod $dst_fh, $stat[2] & 07777, sub {
+                           aioreq_pri $pri;
+                           add $grp aio_chown $dst_fh, $stat[4], $stat[5], sub {
+                              aioreq_pri $pri;
+                              add $grp aio_close $dst_fh;
+                           }
+                        };
+                     };
 
                      aioreq_pri $pri;
-                     add $grp aio_close $dst_fh;
+                     add $grp aio_utime $dst_fh, $stat[8], $stat[9], sub {
+                        if ($_[0] < 0 && $! == ENOSYS) {
+                           aioreq_pri $pri;
+                           add $grp aio_utime $dst, $stat[8], $stat[9], $ch;
+                        } else {
+                           $ch->();
+                        }
+                     };
                   } else {
                      $grp->result (-1);
                      close $src_fh;