apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/file_io/win32 dir.c
Date Tue, 07 Aug 2001 19:57:44 GMT
trawick     01/08/07 12:57:44

  Modified:    .        STATUS CHANGES
               file_io/win32 dir.c
  Log:
  Fix apr_dir_rewind() for Win32 to avoid returning a bogus error.
  
  Revision  Changes    Path
  1.56      +1 -4      apr/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apr/STATUS,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- STATUS	2001/08/07 17:30:10	1.55
  +++ STATUS	2001/08/07 19:57:44	1.56
  @@ -1,5 +1,5 @@
   APACHE PORTABLE RUNTIME (APR) LIBRARY STATUS:			-*-text-*-
  -Last modified at [$Date: 2001/08/07 17:30:10 $]
  +Last modified at [$Date: 2001/08/07 19:57:44 $]
   
   Release:
   
  @@ -25,9 +25,6 @@
         which won't accept Win32's canonical \\?\D:\foo long naming
         conventions.  Convert to _ByHandle or add an arg to our utf-8
         name converter so we can handle this.
  -
  -    * Jeff Trawick reports our pool cleanup on apr_dir_*() is horked
  -      on Win32.
   
   RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
       * Get OTHER_CHILD support into Win32
  
  
  
  1.132     +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- CHANGES	2001/08/05 23:05:37	1.131
  +++ CHANGES	2001/08/07 19:57:44	1.132
  @@ -1,5 +1,8 @@
   Changes with APR b1  
   
  +  *) Fix apr_dir_rewind() for Win32 to avoid returning a bogus error.
  +     [Jeff Trawick, William Rowe]
  +
     *) Detect required libraries first.  This minimizes the libraries
        needed in apr_hints.m4.  [Justin Erenkrantz]
   
  
  
  
  1.59      +3 -11     apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/dir.c,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- dir.c	2001/08/07 14:12:29	1.58
  +++ dir.c	2001/08/07 19:57:44	1.59
  @@ -257,18 +257,10 @@
   
   APR_DECLARE(apr_status_t) apr_dir_rewind(apr_dir_t *dir)
   {
  -    /* XXX FIXME...
  -     * 1) dir_cleanup() does FindClose(), so the FindClose() call
  -     *    here will always return a meaningless error (bad handle).
  -     * 2) Don't we need to re-open the directory, or is there a
  -     *    Win32 way to rewind?
  +    /* this will mark the handle as invalid and we'll open it
  +     * again if apr_dir_read() is subsequently called
        */
  -    dir_cleanup(dir);
  -    if (!FindClose(dir->dirhand)) {
  -        return apr_get_os_error();
  -    }    
  -    dir->dirhand = INVALID_HANDLE_VALUE;
  -    return APR_SUCCESS;
  +    return dir_cleanup(dir);
   }
   
   APR_DECLARE(apr_status_t) apr_dir_make(const char *path, apr_fileperms_t perm,
  
  
  

Mime
View raw message