--- osi_readdir.c.orig	Thu Sep 15 11:37:48 2005
+++ osi_readdir.c	Thu Sep 15 11:39:24 2005
@@ -15,17 +15,19 @@
          * We want to fetch new dirents if either:
          * 1. This is our first read of the directory
          * 2. We've reached the end of a previous fetch for this directory
-         *    and there might be more dirents to fetch
+         *    and there might be more dirents to fetch (getdirentries only)
          */
+    #ifdef HAVE_GETDIRENTRIES                       
         if( d->dd_loc >= d->dd_size )
         {                                                     
-        #ifdef HAVE_GETDIRENTRIES                             
             d->dd_size = getdirentries( d->dd_fd, d->buffer,  
                                         d->dd_len, &d->dd_seek );
-        #else                                                 
+    #else                                                 
+        if( d->dd_loc == 0 )
+        {                                                     
             d->dd_size = getdents( d->dd_fd, (struct dirent *)d->buffer,    
                                    d->dd_len );               
-        #endif
+    #endif
 
             if( d->dd_size <= 0  )                                
             {