diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2001-08-23 21:08:20 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2001-08-23 21:08:20 +0200 |
| commit | 3ba6289b687a9887f68a2d619631d656698ebd52 (patch) | |
| tree | fddf0ae629017a425cb2f43a125cf3f268dad4b3 /os/win32/os.h | |
| parent | Canonicalization will now occur on all sub_req_lookup_file() calls, (diff) | |
| download | apache2-3ba6289b687a9887f68a2d619631d656698ebd52.tar.xz apache2-3ba6289b687a9887f68a2d619631d656698ebd52.zip | |
Eliminated ap_os_[systemcase|[case_]canonical]_filename() and
move ap_os_is_path_absolute() into util.c (now relies on apr.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90567 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os/win32/os.h')
| -rw-r--r-- | os/win32/os.h | 44 |
1 files changed, 3 insertions, 41 deletions
diff --git a/os/win32/os.h b/os/win32/os.h index 560c5963f2..31e2305628 100644 --- a/os/win32/os.h +++ b/os/win32/os.h @@ -73,57 +73,19 @@ #define _WIN32 #endif -#include "apr_general.h" -#include <process.h> -#include <malloc.h> #include <io.h> #include <fcntl.h> #define PLATFORM "Win32" -#define APACHE_MPM_DIR "modules/mpm/winnt" /* generated on unix */ - -/* Although DIR_TYPE is dirent (see nt/readdir.h) we need direct.h for - chdir() */ -#include <direct.h> - -#define CASE_BLIND_FILESYSTEM -#define NO_WRITEV +/* going away shortly... */ #define HAVE_CANONICAL_FILENAME #define HAVE_DRIVE_LETTERS #define HAVE_UNC_PATHS +#define CASE_BLIND_FILESYSTEM -typedef int uid_t; -typedef int gid_t; -typedef int pid_t; -typedef int mode_t; -typedef char * caddr_t; - -#define S_ISLNK(m) (0) -#define S_ISREG(m) ((m & _S_IFREG) == _S_IFREG) -#ifndef S_ISDIR -#define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR) -#endif - -#define JMP_BUF jmp_buf -#define O_CREAT _O_CREAT -#define O_RDWR _O_RDWR +#define APACHE_MPM_DIR "server/mpm/winnt" /* generated on unix */ #include <stddef.h> -__inline int ap_os_is_path_absolute(const char *file) -{ - /* For now, just do the same check that http_request.c and mod_alias.c do. - * XXX: Accept /bleh still? Or do we concur that d:/bleh is a minimum - * requirement? If so, canonical name needs to convert to drive/path - * syntax, and the test becomes (file[0] == '/' && file[1] == '/') ||... - */ - return file && (file[0] == '/' || (file[1] == ':' && file[2] == '/')); -} - -/* OS-dependent filename routines in util_win32.c */ -AP_DECLARE(char *) ap_os_canonical_filename(apr_pool_t *p, const char *file); -AP_DECLARE(char *) ap_os_case_canonical_filename(apr_pool_t *pPool, const char *szFile); -AP_DECLARE(char *) ap_os_systemcase_filename(apr_pool_t *pPool, const char *szFile); - #endif /* ! APACHE_OS_H */ |