apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/file_io/unix filestat.c
Date Wed, 24 Jan 2001 15:48:03 GMT
wrowe       01/01/24 07:48:03

  Modified:    include  apr_file_info.h
               file_io/unix filestat.c
  Log:
    The csize solution does solve BeOS R4.5, so back that out of all unix
    paths until some better logic (al la libtool) is coded.
  
    The asize field is insufficiently defined, so it is removed.
  
  Submitted by:	Sam TH <sam@uchicago.edu>
  Reviewed by:	Greg Stein, Will Rowe
  
  Revision  Changes    Path
  1.6       +1 -4      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_file_info.h	2001/01/23 04:10:47	1.5
  +++ apr_file_info.h	2001/01/24 15:47:53	1.6
  @@ -141,8 +141,7 @@
   #define APR_FINFO_CTIME  0x00000020
   #define APR_FINFO_ATIME  0x00000040
   #define APR_FINFO_SIZE   0x00000100
  -#define APR_FINFO_ASIZE  0x00000200
  -#define APR_FINFO_CSIZE  0x00000400
  +#define APR_FINFO_CSIZE  0x00000200
   #define APR_FINFO_DEV    0x00001000
   #define APR_FINFO_INODE  0x00002000
   #define APR_FINFO_NLINK  0x00004000
  @@ -190,8 +189,6 @@
       apr_int16_t nlink;
       /** The size of the file */
       apr_off_t size;
  -    /** The space allocated for the file */
  -    apr_off_t asize;
       /** The storage size consumed by the file */
       apr_off_t csize;
       /** The time the file was last accessed */
  
  
  
  1.39      +10 -4     apr/file_io/unix/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/filestat.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- filestat.c	2001/01/23 04:10:46	1.38
  +++ filestat.c	2001/01/24 15:48:00	1.39
  @@ -97,13 +97,19 @@
       apr_ansi_time_to_apr_time(&finfo->atime, info.st_atime);
       apr_ansi_time_to_apr_time(&finfo->mtime, info.st_mtime);
       apr_ansi_time_to_apr_time(&finfo->ctime, info.st_ctime);
  -    if (wanted & APR_FINFO_CSIZE) {
  -        finfo->csize = info.st_blocks * 512;
  -        finfo->valid |= APR_FINFO_CSIZE;
  -    }
  +    /* ### needs to be revisited  
  +     * if (wanted & APR_FINFO_CSIZE) {
  +     *   finfo->csize = info.st_blocks * 512;
  +     *   finfo->valid |= APR_FINFO_CSIZE;
  +     * }
  +     */
       if (finfo->filetype == APR_LNK) {
           finfo->valid |= APR_FINFO_LINK;
       }
  +
  +    if (wanted & ~finfo->valid)
  +        return APR_INCOMPLETE;
  +
       return APR_SUCCESS;
   }
   
  
  
  

Mime
View raw message