apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/include apr_errno.h
Date Sat, 28 Dec 2002 20:39:49 GMT
wrowe       2002/12/28 12:39:49

  Modified:    file_io/win32 filestat.c
               include  apr_errno.h
  Log:
    Introduce APR_EPATHWILD to designate that a given apr_file_[l]stat()
    was against a filename that included wildcards (on platforms where
    wildcards are invalid filename characters, e.g. OS2, Win32 etc.)
  
  Revision  Changes    Path
  1.73      +4 -1      apr/file_io/win32/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filestat.c,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- filestat.c	12 Dec 2002 07:11:54 -0000	1.72
  +++ filestat.c	28 Dec 2002 20:39:49 -0000	1.73
  @@ -78,7 +78,10 @@
       }
       while (*name) {
           if (!IS_FNCHAR(*name) && (*name != '\\') && (*name != '/')) {
  -            return APR_EBADPATH;
  +            if (*name == '?' || *name == '*')
  +                return APR_EPATHWILD;
  +            else
  +                return APR_EBADPATH;
           }
           ++name;
       }
  
  
  
  1.105     +4 -0      apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_errno.h,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- apr_errno.h	26 Dec 2002 08:20:06 -0000	1.104
  +++ apr_errno.h	28 Dec 2002 20:39:49 -0000	1.105
  @@ -307,6 +307,8 @@
   #define APR_EABOVEROOT     (APR_OS_START_ERROR + 23)
   /** @see APR_STATUS_IS_EBADPATH */
   #define APR_EBADPATH       (APR_OS_START_ERROR + 24)
  +/** @see APR_STATUS_IS_EPATHWILD */
  +#define APR_EPATHWILD      (APR_OS_START_ERROR + 25)
   
   /* APR ERROR VALUE TESTS */
   /** 
  @@ -375,6 +377,8 @@
   #define APR_STATUS_IS_EABOVEROOT(s)     ((s) == APR_EABOVEROOT)
   /** The given path was bad. */
   #define APR_STATUS_IS_EBADPATH(s)       ((s) == APR_EBADPATH)
  +/** The given path contained wildcards. */
  +#define APR_STATUS_IS_EPATHWILD(s)      ((s) == APR_EPATHWILD)
   
   /* APR STATUS VALUES */
   /** @see APR_STATUS_IS_INCHILD */
  
  
  

Mime
View raw message