--- IO-AIO/AIO.pm	2009/06/06 17:25:13	1.148
+++ IO-AIO/AIO.pm	2009/06/06 18:19:35	1.149
@@ -195,7 +195,7 @@
 use base 'Exporter';
 
 BEGIN {
-   our $VERSION = '3.19';
+   our $VERSION = '3.2';
 
    our @AIO_REQ = qw(aio_sendfile aio_read aio_write aio_open aio_close
                      aio_stat aio_lstat aio_unlink aio_rmdir aio_readdir aio_readdirx
@@ -580,6 +580,11 @@
 find directories, or you want to find all directories while avoiding to
 stat() each entry.
 
+If the system returns type information in readdir, then this is used
+to find directories directly.  Otherwise, likely directories are files
+beginning with ".", or otherwise files with no dots, of which files with
+short names are tried first.
+
 =item AIO::READDIR_STAT_ORDER
 
 When this flag is set, then the names will be returned in an order
@@ -772,20 +777,24 @@
 
 The C<aio_readdir> cannot be avoided, but C<stat()>'ing every entry can.
 
-After reading the directory, the modification time, size etc. of the
-directory before and after the readdir is checked, and if they match (and
-isn't the current time), the link count will be used to decide how many
-entries are directories (if >= 2). Otherwise, no knowledge of the number
-of subdirectories will be assumed.
-
-Then entries will be sorted into likely directories (everything without
-a non-initial dot currently) and likely non-directories (everything
-else). Then every entry plus an appended C</.> will be C<stat>'ed,
-likely directories first. If that succeeds, it assumes that the entry
-is a directory or a symlink to directory (which will be checked
+If readdir returns file type information, then this is used directly to
+find directories.
+
+Otherwise, after reading the directory, the modification time, size etc.
+of the directory before and after the readdir is checked, and if they
+match (and isn't the current time), the link count will be used to decide
+how many entries are directories (if >= 2). Otherwise, no knowledge of the
+number of subdirectories will be assumed.
+
+Then entries will be sorted into likely directories a non-initial dot
+currently) and likely non-directories (see C<aio_readdirx>). Then every
+entry plus an appended C</.> will be C<stat>'ed, likely directories first,
+in order of their inode numbers. If that succeeds, it assumes that the
+entry is a directory or a symlink to directory (which will be checked
 seperately). This is often faster than stat'ing the entry itself because
 filesystems might detect the type of the entry without reading the inode
-data (e.g. ext2fs filetype feature).
+data (e.g. ext2fs filetype feature), even on systems that cannot return
+the filetype information on readdir.
 
 If the known number of directories (link count - 2) has been reached, the
 rest of the entries is assumed to be non-directories.
@@ -838,13 +847,6 @@
                   or return $grp->result ([], $entries);
             }
 
-            # sort into likely dirs and likely nondirs
-            # dirs == files without ".", short entries first
-            $entries = [map $_->[0],
-                           sort { $b->[1] cmp $a->[1] }
-                              map [$_, sprintf "%s%04d", (/.\./ ? "1" : "0"), length],
-                                 @$entries];
-
             my (@dirs, @nondirs);
 
             my $statgrp = add $grp aio_group sub {