apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: apr/include/arch/os2 fileio.h
Date Sat, 01 Sep 2001 05:06:26 GMT
bjh         01/08/31 22:06:26

  Modified:    file_io/os2 Makefile.in filepath.c
               include/arch/os2 fileio.h
  Added:       file_io/os2 filesys.c
  Log:
  OS/2: Get apr_filepath_merge() & friends working, making use of the code
  in file_io/win32/filepath.c by Bill Rowe.
  
  Revision  Changes    Path
  1.21      +2 -1      apr/file_io/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/Makefile.in,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Makefile.in	2001/04/02 16:03:25	1.20
  +++ Makefile.in	2001/09/01 05:06:26	1.21
  @@ -11,7 +11,8 @@
   	flock.lo \
   	maperrorcode.lo \
   	fullrw.lo \
  -	filepath.lo
  +	filepath.lo \
  +	filesys.lo
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.2       +4 -1      apr/file_io/os2/filepath.c
  
  Index: filepath.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/filepath.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- filepath.c	2001/04/02 16:03:25	1.1
  +++ filepath.c	2001/09/01 05:06:26	1.2
  @@ -1 +1,4 @@
  -#include "../unix/filepath.c"
  +/* OS/2 & Win32 have much in common with regards to file names (both are 
  + * DOSish) so it makes sense to share some code 
  + */
  +#include "../win32/filepath.c"
  
  
  
  1.1                  apr/file_io/os2/filesys.c
  
  Index: filesys.c
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #include "apr.h"
  #include "fileio.h"
  #include "apr_strings.h"
  #include <ctype.h>
  
  /* OS/2 Exceptions:
   *
   * Note that trailing spaces and trailing periods are never recorded
   * in the file system.
   *
   * Leading spaces and periods are accepted, however.
   * The * ? < > codes all have wildcard side effects
   * The " / \ : are exclusively component separator tokens 
   * The system doesn't accept | for any (known) purpose 
   * Oddly, \x7f _is_ acceptable ;)
   */
  
  const char c_is_fnchar[256] =
  {/* Reject all ctrl codes...                                         */
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
   /*   "                 *         /                      :   <   > ? */
      1,0,1,1,1,1,1,1,1,1,0,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,0,1,0,1,0,0,
   /*                                                          \       */
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,
   /*                                                      :   |       */
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,
   /* High bit codes are accepted (subject to utf-8->Unicode xlation)  */
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
  };
  
  
  #define IS_SLASH(c) (c == '/' || c == '\\')
  
  
  apr_status_t filepath_root_test(char *path, apr_pool_t *p)
  {
      char drive = toupper(path[0]);
  
      if (drive >= 'A' && drive <= 'Z' && path[1] == ':' &&
IS_SLASH(path[2]))
          return APR_SUCCESS;
  
      return APR_EBADPATH;
  }
  
  
  apr_status_t filepath_drive_get(char **rootpath, char drive, apr_pool_t *p)
  {
      char path[APR_PATH_MAX];
      char *pos;
      ULONG rc;
      ULONG bufsize = sizeof(path) - 3;
  
      path[0] = drive;
      path[1] = ':';
      path[2] = '/';
  
      rc = DosQueryCurrentDir(toupper(drive) - 'A', path+3, &bufsize);
  
      if (rc) {
          return APR_FROM_OS_ERROR(rc);
      }
  
      /* ###: We really should consider adding a flag to allow the user
       * to have the APR_FILEPATH_NATIVE result
       */
      for (pos=path; *pos; pos++) {
          if (*pos == '\\')
              *pos = '/';
      }
  
      *rootpath = apr_pstrdup(p, path);
      return APR_SUCCESS;
  }
  
  
  apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p)
  {
      char path[APR_PATH_MAX];
  
      strcpy(path, root);
      if (path[1] == ':')
          path[0] = toupper(path[0]);
      *rootpath = apr_pstrdup(p, path);
      return APR_SUCCESS;
  }
  
  
  APR_DECLARE(apr_status_t) apr_filepath_get(char **defpath, apr_pool_t *p)
  {
      char path[APR_PATH_MAX];
      ULONG drive;
      ULONG drivemap;
      ULONG rv, pathlen = sizeof(path) - 3;
  
      DosQueryCurrentDisk(&drive, &drivemap);
      path[0] = '@' + drive;
      strcpy(path+1, ":\\");
      rv = DosQueryCurrentDir(drive, path+3, &pathlen);
  
      *defpath = apr_pstrdup(p, path);
      return APR_SUCCESS;
  }    
  
  
  
  APR_DECLARE(apr_status_t) apr_filepath_set(const char *path, apr_pool_t *p)
  {
      ULONG rv = 0;
  
      if (path[1] == ':')
          rv = DosSetDefaultDisk(toupper(path[0]) - '@');
  
      if (rv == 0)
          rv = DosSetCurrentDir(path);
  
      return APR_FROM_OS_ERROR(rv);
  }
  
  
  
  1.26      +9 -0      apr/include/arch/os2/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/os2/fileio.h,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- fileio.h	2001/02/16 04:15:50	1.25
  +++ fileio.h	2001/09/01 05:06:26	1.26
  @@ -98,5 +98,14 @@
   apr_status_t apr_os2_time_to_apr_time(apr_time_t *result, FDATE os2date, 
                                         FTIME os2time);
   
  +/* see win32/fileio.h for description of these */
  +extern const char c_is_fnchar[256];
  +
  +#define IS_FNCHAR(c) c_is_fnchar[(unsigned char)c]
  +
  +apr_status_t filepath_root_test(char *path, apr_pool_t *p);
  +apr_status_t filepath_drive_get(char **rootpath, char drive, apr_pool_t *p);
  +apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
  +
   #endif  /* ! FILE_IO_H */
   
  
  
  

Mime
View raw message