cvs commit: apr/include apr_file_info.h

[wr...@apache.org]

wrowe       2003/11/18 16:25:17

  Modified:    file_io/win32 filestat.c
               include  apr_file_info.h
  Log:
    Unix propagates the fname from the apr_file_t to apr_file_info_t
    on an apr_file_info_get() call.  Do the same on Win32, but be
    warned that this is informative, and is not a canonical representation.
  
  Revision  Changes    Path
  1.83      +6 -0      apr/file_io/win32/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filestat.c,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- filestat.c	3 Sep 2003 18:26:57 -0000	1.82
  +++ filestat.c	19 Nov 2003 00:25:17 -0000	1.83
  @@ -445,6 +445,12 @@
       }
   
       finfo->pool = thefile->pool;
  +
  +    /* ### The finfo lifetime may exceed the lifetime of thefile->pool
  +     * but finfo's aren't managed in pools, so where on earth would
  +     * we pstrdup the fname into???
  +     */
  +    finfo->fname = thefile->fname;
    
       /* Extra goodies known only by GetFileInformationByHandle() */
       finfo->inode  =  (apr_ino_t)FileInfo.nFileIndexLow
  
  
  
  1.42      +1 -1      apr/include/apr_file_info.h
  
  Index: apr_file_info.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_file_info.h,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- apr_file_info.h	3 Sep 2003 18:26:57 -0000	1.41
  +++ apr_file_info.h	19 Nov 2003 00:25:17 -0000	1.42
  @@ -229,7 +229,7 @@
       apr_time_t mtime;
       /** The time the file was last changed */
       apr_time_t ctime;
  -    /** The full pathname of the file */
  +    /** The pathname of the file (possibly unrooted) */
       const char *fname;
       /** The file's name (no path) in filesystem case */
       const char *name;