thommay 2003/01/06 16:52:57
Modified: . apr.dsp libapr.dsp
dso/win32 dso.c
file_io/netware filestat.c filesys.c flock.c pipe.c
file_io/os2 dir.c filedup.c filestat.c filesys.c flock.c
maperrorcode.c open.c pipe.c readwrite.c seek.c
file_io/unix copy.c dir.c fileacc.c filedup.c filepath.c
filestat.c flock.c mktemp.c open.c pipe.c
readwrite.c seek.c
file_io/win32 dir.c filedup.c filepath.c filestat.c
filesys.c flock.c open.c pipe.c readwrite.c seek.c
include/arch/beos apr_arch_threadproc.h
include/arch/unix apr_arch_proc_mutex.h
apr_arch_threadproc.h
locks/os2 proc_mutex.c thread_cond.c thread_mutex.c
thread_rwlock.c
locks/unix proc_mutex.c
misc/unix otherchild.c
misc/win32 apr_app.c internal.c misc.c start.c
mmap/unix mmap.c
mmap/win32 mmap.c
network_io/unix sendrecv.c
network_io/win32 sendrecv.c
poll/unix poll.c pollacc.c
shmem/win32 shm.c
support/unix waitio.c
threadproc/netware proc.c
threadproc/os2 proc.c thread.c threadpriv.c
threadproc/win32 proc.c signals.c
user/win32 userinfo.c
Added: include/arch/netware apr_arch_file_io.h
include/arch/os2 apr_arch_file_io.h
include/arch/unix apr_arch_file_io.h
include/arch/win32 apr_arch_file_io.h
Removed: include/arch/netware apr_arch_fileio.h
include/arch/os2 apr_arch_fileio.h
include/arch/unix apr_arch_fileio.h
include/arch/win32 apr_arch_fileio.h
Log:
rename apr_arch_fileio.h to apr_arch_file_io.h for consistency
Revision Changes Path
1.116 +1 -1 apr/apr.dsp
Index: apr.dsp
===================================================================
RCS file: /home/cvs/apr/apr.dsp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- apr.dsp 7 Jan 2003 00:30:48 -0000 1.115
+++ apr.dsp 7 Jan 2003 00:52:50 -0000 1.116
@@ -399,7 +399,7 @@
# End Source File
# Begin Source File
-SOURCE=.\include\arch\win32\apr_arch_fileio.h
+SOURCE=.\include\arch\win32\apr_arch_file_io.h
# End Source File
# Begin Source File
1.78 +1 -1 apr/libapr.dsp
Index: libapr.dsp
===================================================================
RCS file: /home/cvs/apr/libapr.dsp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- libapr.dsp 7 Jan 2003 00:30:48 -0000 1.77
+++ libapr.dsp 7 Jan 2003 00:52:50 -0000 1.78
@@ -405,7 +405,7 @@
# End Source File
# Begin Source File
-SOURCE=.\include\arch\win32\apr_arch_fileio.h
+SOURCE=.\include\arch\win32\apr_arch_file_io.h
# End Source File
# Begin Source File
1.36 +1 -1 apr/dso/win32/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apr/dso/win32/dso.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- dso.c 6 Jan 2003 23:44:16 -0000 1.35
+++ dso.c 7 Jan 2003 00:52:50 -0000 1.36
@@ -55,7 +55,7 @@
#include "apr_arch_dso.h"
#include "apr_strings.h"
#include "apr_private.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_arch_utf8.h"
#if APR_HAS_DSO
1.24 +1 -1 apr/file_io/netware/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apr/file_io/netware/filestat.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- filestat.c 6 Jan 2003 23:44:16 -0000 1.23
+++ filestat.c 7 Jan 2003 00:52:51 -0000 1.24
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "fsio.h"
#include "nks/dirio.h"
#include "apr_file_io.h"
1.8 +1 -1 apr/file_io/netware/filesys.c
Index: filesys.c
===================================================================
RCS file: /home/cvs/apr/file_io/netware/filesys.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- filesys.c 6 Jan 2003 23:44:17 -0000 1.7
+++ filesys.c 7 Jan 2003 00:52:51 -0000 1.8
@@ -53,7 +53,7 @@
*/
#include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p)
1.7 +1 -1 apr/file_io/netware/flock.c
Index: flock.c
===================================================================
RCS file: /home/cvs/apr/file_io/netware/flock.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- flock.c 6 Jan 2003 23:44:17 -0000 1.6
+++ flock.c 7 Jan 2003 00:52:51 -0000 1.7
@@ -53,7 +53,7 @@
*/
#include <nks/fsio.h>
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
apr_status_t apr_file_lock(apr_file_t *thefile, int type)
1.16 +1 -1 apr/file_io/netware/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apr/file_io/netware/pipe.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pipe.c 6 Jan 2003 23:44:17 -0000 1.15
+++ pipe.c 7 Jan 2003 00:52:51 -0000 1.16
@@ -56,7 +56,7 @@
#include <nks/fsio.h>
#include <nks/errno.h>
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
#include "apr_portable.h"
1.35 +1 -1 apr/file_io/os2/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/dir.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- dir.c 6 Jan 2003 23:44:17 -0000 1.34
+++ dir.c 7 Jan 2003 00:52:51 -0000 1.35
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_lib.h"
#include "apr_strings.h"
1.32 +1 -1 apr/file_io/os2/filedup.c
Index: filedup.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/filedup.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- filedup.c 6 Jan 2003 23:44:17 -0000 1.31
+++ filedup.c 7 Jan 2003 00:52:51 -0000 1.32
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_lib.h"
#include "apr_strings.h"
1.34 +1 -1 apr/file_io/os2/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/filestat.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- filestat.c 6 Jan 2003 23:44:17 -0000 1.33
+++ filestat.c 7 Jan 2003 00:52:51 -0000 1.34
@@ -54,7 +54,7 @@
#define INCL_DOS
#define INCL_DOSERRORS
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_lib.h"
#include <sys/time.h>
1.8 +1 -1 apr/file_io/os2/filesys.c
Index: filesys.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/filesys.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- filesys.c 6 Jan 2003 23:44:17 -0000 1.7
+++ filesys.c 7 Jan 2003 00:52:51 -0000 1.8
@@ -53,7 +53,7 @@
*/
#include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
#include "apr_lib.h"
#include <ctype.h>
1.8 +1 -1 apr/file_io/os2/flock.c
Index: flock.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/flock.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- flock.c 6 Jan 2003 23:44:17 -0000 1.7
+++ flock.c 7 Jan 2003 00:52:51 -0000 1.8
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type)
{
1.17 +1 -1 apr/file_io/os2/maperrorcode.c
Index: maperrorcode.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/maperrorcode.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- maperrorcode.c 6 Jan 2003 23:44:17 -0000 1.16
+++ maperrorcode.c 7 Jan 2003 00:52:51 -0000 1.17
@@ -53,7 +53,7 @@
*/
#define INCL_DOSERRORS
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include <errno.h>
#include <string.h>
1.58 +1 -1 apr/file_io/os2/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/open.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- open.c 6 Jan 2003 23:44:17 -0000 1.57
+++ open.c 7 Jan 2003 00:52:51 -0000 1.58
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_lib.h"
#include "apr_portable.h"
1.40 +1 -1 apr/file_io/os2/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/pipe.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pipe.c 6 Jan 2003 23:44:17 -0000 1.39
+++ pipe.c 7 Jan 2003 00:52:51 -0000 1.40
@@ -53,7 +53,7 @@
*/
#define INCL_DOSERRORS
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_general.h"
#include "apr_lib.h"
1.56 +1 -1 apr/file_io/os2/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/readwrite.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- readwrite.c 6 Jan 2003 23:44:17 -0000 1.55
+++ readwrite.c 7 Jan 2003 00:52:51 -0000 1.56
@@ -55,7 +55,7 @@
#define INCL_DOS
#define INCL_DOSERRORS
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_lib.h"
#include "apr_strings.h"
1.25 +1 -1 apr/file_io/os2/seek.c
Index: seek.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/seek.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- seek.c 6 Jan 2003 23:44:18 -0000 1.24
+++ seek.c 7 Jan 2003 00:52:51 -0000 1.25
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_lib.h"
#include <string.h>
1.7 +1 -1 apr/file_io/unix/copy.c
Index: copy.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/copy.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- copy.c 6 Jan 2003 23:44:18 -0000 1.6
+++ copy.c 7 Jan 2003 00:52:52 -0000 1.7
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
static apr_status_t apr_file_transfer_contents(const char *from_path,
1.75 +1 -1 apr/file_io/unix/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/dir.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- dir.c 6 Jan 2003 23:44:18 -0000 1.74
+++ dir.c 7 Jan 2003 00:52:52 -0000 1.75
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
#include "apr_portable.h"
#if APR_HAVE_SYS_SYSLIMITS_H
1.56 +1 -1 apr/file_io/unix/fileacc.c
Index: fileacc.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/fileacc.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- fileacc.c 6 Jan 2003 23:44:18 -0000 1.55
+++ fileacc.c 7 Jan 2003 00:52:52 -0000 1.56
@@ -53,7 +53,7 @@
*/
#include "apr_strings.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
/* A file to put ALL of the accessor functions for apr_file_t types. */
1.53 +1 -1 apr/file_io/unix/filedup.c
Index: filedup.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/filedup.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- filedup.c 6 Jan 2003 23:44:18 -0000 1.52
+++ filedup.c 7 Jan 2003 00:52:53 -0000 1.53
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
#include "apr_portable.h"
#include "apr_thread_mutex.h"
1.20 +1 -1 apr/file_io/unix/filepath.c
Index: filepath.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/filepath.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- filepath.c 6 Jan 2003 23:44:19 -0000 1.19
+++ filepath.c 7 Jan 2003 00:52:53 -0000 1.20
@@ -53,7 +53,7 @@
*/
#include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_strings.h"
#define APR_WANT_STRFUNC
1.64 +1 -1 apr/file_io/unix/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/filestat.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- filestat.c 6 Jan 2003 23:44:19 -0000 1.63
+++ filestat.c 7 Jan 2003 00:52:53 -0000 1.64
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_general.h"
#include "apr_strings.h"
1.10 +1 -1 apr/file_io/unix/flock.c
Index: flock.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/flock.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- flock.c 6 Jan 2003 23:44:19 -0000 1.9
+++ flock.c 7 Jan 2003 00:52:53 -0000 1.10
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#if APR_HAVE_FCNTL_H
#include <fcntl.h>
1.27 +1 -1 apr/file_io/unix/mktemp.c
Index: mktemp.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/mktemp.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mktemp.c 6 Jan 2003 23:44:19 -0000 1.26
+++ mktemp.c 7 Jan 2003 00:52:53 -0000 1.27
@@ -87,7 +87,7 @@
#include "apr_private.h"
#include "apr_file_io.h" /* prototype of apr_mkstemp() */
#include "apr_strings.h" /* prototype of apr_mkstemp() */
-#include "apr_arch_fileio.h" /* prototype of apr_mkstemp() */
+#include "apr_arch_file_io.h" /* prototype of apr_mkstemp() */
#include "apr_portable.h" /* for apr_os_file_put() */
#ifndef HAVE_MKSTEMP
1.108 +1 -1 apr/file_io/unix/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/open.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- open.c 6 Jan 2003 23:44:19 -0000 1.107
+++ open.c 7 Jan 2003 00:52:53 -0000 1.108
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
#include "apr_portable.h"
#include "apr_thread_mutex.h"
1.61 +1 -1 apr/file_io/unix/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/pipe.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- pipe.c 6 Jan 2003 23:44:19 -0000 1.60
+++ pipe.c 7 Jan 2003 00:52:53 -0000 1.61
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
#include "apr_portable.h"
1.84 +1 -1 apr/file_io/unix/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/readwrite.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- readwrite.c 6 Jan 2003 23:44:20 -0000 1.83
+++ readwrite.c 7 Jan 2003 00:52:53 -0000 1.84
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
#include "apr_thread_mutex.h"
#include "apr_support.h"
1.30 +1 -1 apr/file_io/unix/seek.c
Index: seek.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/seek.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- seek.c 6 Jan 2003 23:44:20 -0000 1.29
+++ seek.c 7 Jan 2003 00:52:53 -0000 1.30
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
{
1.70 +1 -1 apr/file_io/win32/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/dir.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- dir.c 6 Jan 2003 23:44:20 -0000 1.69
+++ dir.c 7 Jan 2003 00:52:53 -0000 1.70
@@ -53,7 +53,7 @@
*/
#include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_strings.h"
#include "apr_portable.h"
1.54 +1 -1 apr/file_io/win32/filedup.c
Index: filedup.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/filedup.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- filedup.c 6 Jan 2003 23:44:20 -0000 1.53
+++ filedup.c 7 Jan 2003 00:52:53 -0000 1.54
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_general.h"
#include "apr_strings.h"
1.36 +1 -1 apr/file_io/win32/filepath.c
Index: filepath.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/filepath.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- filepath.c 6 Jan 2003 23:44:20 -0000 1.35
+++ filepath.c 7 Jan 2003 00:52:53 -0000 1.36
@@ -53,7 +53,7 @@
*/
#include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
#include "apr_lib.h"
#include <string.h>
1.77 +1 -1 apr/file_io/win32/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/filestat.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- filestat.c 6 Jan 2003 23:44:21 -0000 1.76
+++ filestat.c 7 Jan 2003 00:52:53 -0000 1.77
@@ -55,7 +55,7 @@
#include "apr.h"
#include <aclapi.h>
#include "apr_private.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_general.h"
#include "apr_strings.h"
1.11 +1 -1 apr/file_io/win32/filesys.c
Index: filesys.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/filesys.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- filesys.c 6 Jan 2003 23:44:21 -0000 1.10
+++ filesys.c 7 Jan 2003 00:52:53 -0000 1.11
@@ -53,7 +53,7 @@
*/
#include "apr.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
/* Win32 Exceptions:
1.14 +1 -1 apr/file_io/win32/flock.c
Index: flock.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/flock.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- flock.c 6 Jan 2003 23:44:21 -0000 1.13
+++ flock.c 7 Jan 2003 00:52:54 -0000 1.14
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type)
{
1.117 +1 -1 apr/file_io/win32/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/open.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- open.c 6 Jan 2003 23:44:21 -0000 1.116
+++ open.c 7 Jan 2003 00:52:54 -0000 1.117
@@ -53,7 +53,7 @@
*/
#include "apr_private.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_general.h"
#include "apr_strings.h"
1.49 +1 -1 apr/file_io/win32/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/pipe.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pipe.c 6 Jan 2003 23:44:21 -0000 1.48
+++ pipe.c 7 Jan 2003 00:52:54 -0000 1.49
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_general.h"
#include "apr_strings.h"
1.76 +1 -1 apr/file_io/win32/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/readwrite.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- readwrite.c 6 Jan 2003 23:44:21 -0000 1.75
+++ readwrite.c 7 Jan 2003 00:52:54 -0000 1.76
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_general.h"
#include "apr_strings.h"
1.27 +1 -1 apr/file_io/win32/seek.c
Index: seek.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/seek.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- seek.c 6 Jan 2003 23:44:22 -0000 1.26
+++ seek.c 7 Jan 2003 00:52:54 -0000 1.27
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
#include "apr_file_io.h"
#include <errno.h>
#include <string.h>
1.3 +1 -1 apr/include/arch/beos/apr_arch_threadproc.h
Index: apr_arch_threadproc.h
===================================================================
RCS file: /home/cvs/apr/include/arch/beos/apr_arch_threadproc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr_arch_threadproc.h 7 Jan 2003 00:06:28 -0000 1.2
+++ apr_arch_threadproc.h 7 Jan 2003 00:52:54 -0000 1.3
@@ -53,7 +53,7 @@
*/
#include "apr_thread_proc.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_file_io.h"
#include "apr_thread_proc.h"
#include "apr_general.h"
1.1 apr/include/arch/netware/apr_arch_file_io.h
Index: apr_arch_file_io.h
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2003 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 [EMAIL PROTECTED]
*
* 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/>.
*/
#ifndef FILE_IO_H
#define FILE_IO_H
#include "apr.h"
#include "apr_private.h"
#include "apr_general.h"
#include "apr_tables.h"
#include "apr_file_io.h"
#include "apr_file_info.h"
#include "apr_errno.h"
#include "apr_lib.h"
/* System headers the file I/O library needs */
#if APR_HAVE_FCNTL_H
#include <fcntl.h>
#endif
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#if APR_HAVE_ERRNO_H
#include <errno.h>
#endif
#if APR_HAVE_STRING_H
#include <string.h>
#endif
#if APR_HAVE_STRINGS_H
#include <strings.h>
#endif
#if APR_HAVE_DIRENT_H
#include <dirent.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
#if APR_HAVE_STDIO_H
#include <stdio.h>
#endif
#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
#if APR_HAVE_SYS_UIO_H
#include <sys/uio.h>
#endif
#if APR_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <fsio.h>
/* End System headers */
#define APR_FILE_BUFSIZE 4096
struct apr_file_t {
apr_pool_t *pool;
int filedes;
char *fname;
apr_int32_t flags;
int eof_hit;
int is_pipe;
apr_interval_time_t timeout;
int buffered;
enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
int ungetchar; /* Last char provided by an unget op. (-1 = no char)*/
/* Stuff for buffered mode */
char *buffer;
int bufpos; /* Read/Write position in buffer */
unsigned long dataRead; /* amount of valid data read into buffer */
int direction; /* buffer being used for 0 = read, 1 = write */
unsigned long filePtr; /* position in file of handle */
#if APR_HAS_THREADS
struct apr_thread_mutex_t *thlock;
#endif
};
struct apr_dir_t {
apr_pool_t *pool;
char *dirname;
DIR *dirstruct;
struct dirent *entry;
};
typedef struct apr_stat_entry_t apr_stat_entry_t;
struct apr_stat_entry_t {
struct stat info;
char *casedName;
apr_time_t expire;
NXPathCtx_t pathCtx;
};
extern apr_int32_t CpuCurrentProcessor; /* system variable */
#define MAX_SERVER_NAME 64
#define MAX_VOLUME_NAME 64
#define MAX_PATH_NAME 256
#define MAX_FILE_NAME 256
#define DRIVE_ONLY 1
/* If the user passes d: vs. D: (or //mach/share vs. //MACH/SHARE),
* we need to fold the case to canonical form. This function is
* supposed to do so.
*/
apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
/* This function check to see of the given path includes a drive/volume
* specifier. If the _only_ parameter is set to DRIVE_ONLY then it
* check to see of the path only contains a drive/volume specifier and
* nothing else.
*/
apr_status_t filepath_has_drive(const char *rootpath, int only, apr_pool_t
*p);
/* This function compares the drive/volume specifiers for each given path.
* It returns zero if they match or non-zero if not.
*/
apr_status_t filepath_compare_drive(const char *path1, const char *path2,
apr_pool_t *p);
apr_status_t apr_unix_file_cleanup(void *);
#endif /* ! FILE_IO_H */
1.1 apr/include/arch/os2/apr_arch_file_io.h
Index: apr_arch_file_io.h
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2003 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 [EMAIL PROTECTED]
*
* 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/>.
*/
#ifndef FILE_IO_H
#define FILE_IO_H
#include "apr_private.h"
#include "apr_general.h"
#include "apr_thread_mutex.h"
#include "apr_file_io.h"
#include "apr_file_info.h"
#include "apr_errno.h"
/* We have an implementation of mkstemp but it's not very multi-threading
* friendly & is part of the POSIX emulation rather than native so don't
* use it.
*/
#undef HAVE_MKSTEMP
#define APR_FILE_BUFSIZE 4096
struct apr_file_t {
apr_pool_t *pool;
HFILE filedes;
char * fname;
int isopen;
int buffered;
int eof_hit;
apr_int32_t flags;
int timeout;
int pipe;
HEV pipeSem;
enum { BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
/* Stuff for buffered mode */
char *buffer;
int bufpos; // Read/Write position in buffer
unsigned long dataRead; // amount of valid data read into buffer
int direction; // buffer being used for 0 = read, 1 = write
unsigned long filePtr; // position in file of handle
apr_thread_mutex_t *mutex;// mutex semaphore, must be owned to access the
above fields
};
struct apr_dir_t {
apr_pool_t *pool;
char *dirname;
ULONG handle;
FILEFINDBUF3 entry;
int validentry;
};
apr_status_t apr_file_cleanup(void *);
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_int32_t flags, apr_pool_t *p);
apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
#endif /* ! FILE_IO_H */
1.3 +1 -1 apr/include/arch/unix/apr_arch_proc_mutex.h
Index: apr_arch_proc_mutex.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/apr_arch_proc_mutex.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr_arch_proc_mutex.h 7 Jan 2003 00:06:29 -0000 1.2
+++ apr_arch_proc_mutex.h 7 Jan 2003 00:52:54 -0000 1.3
@@ -63,7 +63,7 @@
#include "apr_pools.h"
#include "apr_portable.h"
#include "apr_file_io.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
/* System headers required by Locks library */
#if APR_HAVE_SYS_TYPES_H
1.3 +1 -1 apr/include/arch/unix/apr_arch_threadproc.h
Index: apr_arch_threadproc.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/apr_arch_threadproc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr_arch_threadproc.h 7 Jan 2003 00:06:29 -0000 1.2
+++ apr_arch_threadproc.h 7 Jan 2003 00:52:54 -0000 1.3
@@ -56,7 +56,7 @@
#include "apr_private.h"
#include "apr_thread_proc.h"
#include "apr_file_io.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
/* System headers required for thread/process library */
#if APR_HAVE_PTHREAD_H
1.1 apr/include/arch/unix/apr_arch_file_io.h
Index: apr_arch_file_io.h
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2003 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 [EMAIL PROTECTED]
*
* 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/>.
*/
#ifndef FILE_IO_H
#define FILE_IO_H
#include "apr.h"
#include "apr_private.h"
#include "apr_general.h"
#include "apr_tables.h"
#include "apr_file_io.h"
#include "apr_file_info.h"
#include "apr_errno.h"
#include "apr_lib.h"
#include "apr_thread_mutex.h"
/* System headers the file I/O library needs */
#if APR_HAVE_FCNTL_H
#include <fcntl.h>
#endif
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#if APR_HAVE_ERRNO_H
#include <errno.h>
#endif
#if APR_HAVE_STRING_H
#include <string.h>
#endif
#if APR_HAVE_STRINGS_H
#include <strings.h>
#endif
#if APR_HAVE_DIRENT_H
#include <dirent.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
#if APR_HAVE_STDIO_H
#include <stdio.h>
#endif
#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
#if APR_HAVE_SYS_UIO_H
#include <sys/uio.h>
#endif
#if APR_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef BEOS
#include <kernel/OS.h>
#endif
#if BEOS_BONE
# ifndef BONE7
/* prior to BONE/7 fd_set & select were defined in sys/socket.h */
# include <sys/socket.h>
# else
/* Be moved the fd_set stuff and also the FIONBIO definition... */
# include <sys/ioctl.h>
# endif
#endif
/* End System headers */
#define APR_FILE_BUFSIZE 4096
struct apr_file_t {
apr_pool_t *pool;
int filedes;
char *fname;
apr_int32_t flags;
int eof_hit;
int is_pipe;
apr_interval_time_t timeout;
int buffered;
enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
int ungetchar; /* Last char provided by an unget op. (-1 = no char)*/
/* Stuff for buffered mode */
char *buffer;
int bufpos; /* Read/Write position in buffer */
unsigned long dataRead; /* amount of valid data read into buffer */
int direction; /* buffer being used for 0 = read, 1 = write */
unsigned long filePtr; /* position in file of handle */
#if APR_HAS_THREADS
struct apr_thread_mutex_t *thlock;
#endif
};
struct apr_dir_t {
apr_pool_t *pool;
char *dirname;
DIR *dirstruct;
struct dirent *entry;
};
apr_status_t apr_unix_file_cleanup(void *);
mode_t apr_unix_perms2mode(apr_fileperms_t perms);
apr_fileperms_t apr_unix_mode2perms(mode_t mode);
#endif /* ! FILE_IO_H */
1.1 apr/include/arch/win32/apr_arch_file_io.h
Index: apr_arch_file_io.h
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2003 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 [EMAIL PROTECTED]
*
* 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/>.
*/
#ifndef FILE_IO_H
#define FILE_IO_H
#include "apr.h"
#include "apr_private.h"
#include "apr_pools.h"
#include "apr_general.h"
#include "apr_tables.h"
#include "apr_thread_mutex.h"
#include "apr_file_io.h"
#include "apr_file_info.h"
#include "apr_errno.h"
#include "apr_arch_misc.h"
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_TIME_H
#include <time.h>
#endif
#if APR_HAVE_DIRENT_H
#include <dirent.h>
#endif
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
#if APR_HAS_UNICODE_FS
#include "arch/win32/apr_arch_utf8.h"
#include <wchar.h>
typedef apr_uint16_t apr_wchar_t;
/* Helper functions for the WinNT ApiW() functions. APR treats all
* resource identifiers (files, etc) by their UTF-8 name, to provide
* access to all named identifiers. [UTF-8 completely maps Unicode
* into char type strings.]
*
* The _path flavors below provide us fast mappings of the
* Unicode filename //?/D:/path and //?/UNC/mach/share/path mappings,
* which allow unlimited (well, 32000 wide character) length names.
* These prefixes may appear in Unicode, but must not appear in the
* Ascii API calls. So we tack them on in utf8_to_unicode_path, and
* strip them right back off in unicode_to_utf8_path.
*/
apr_status_t utf8_to_unicode_path(apr_wchar_t* dststr, apr_size_t dstchars,
const char* srcstr);
apr_status_t unicode_to_utf8_path(char* dststr, apr_size_t dstchars,
const apr_wchar_t* srcstr);
#endif /* APR_HAS_UNICODE_FS */
/* Another Helper functions for the WinNT ApiW() functions. We need to
* derive some 'resource' names (max length 255 characters, prefixed with
* Global/ or Local/ on WinNT) from something that looks like a filename.
* Since 'resource' names never contain slashes, convert these to '_'s
* and return the appropriate char* or wchar* for ApiA or ApiW calls.
*/
void *res_name_from_filename(const char *file, int global, apr_pool_t *pool);
#define APR_FILE_MAX MAX_PATH
#define APR_FILE_BUFSIZE 4096
/* obscure ommissions from msvc's sys/stat.h */
#ifdef _MSC_VER
#define S_IFIFO _S_IFIFO /* pipe */
#define S_IFBLK 0060000 /* Block Special */
#define S_IFLNK 0120000 /* Symbolic Link */
#define S_IFSOCK 0140000 /* Socket */
#define S_IFWHT 0160000 /* Whiteout */
#endif
/* Internal Flags for apr_file_open */
#define APR_OPENINFO 0x4000 /* Open without READ or WRITE access */
#define APR_OPENLINK 0x2000 /* Open a link itself, if supported */
#define APR_READCONTROL 0x1000 /* Read the file's owner/perms */
#define APR_WRITECONTROL 0x0800 /* Modifythe file's owner/perms */
/* Entries missing from the MSVC 5.0 Win32 SDK:
*/
#ifndef FILE_ATTRIBUTE_DEVICE
#define FILE_ATTRIBUTE_DEVICE 0x00000040
#endif
#ifndef FILE_ATTRIBUTE_REPARSE_POINT
#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
#endif
#ifndef FILE_FLAG_OPEN_NO_RECALL
#define FILE_FLAG_OPEN_NO_RECALL 0x00100000
#endif
#ifndef FILE_FLAG_OPEN_REPARSE_POINT
#define FILE_FLAG_OPEN_REPARSE_POINT 0x00200000
#endif
#ifndef TRUSTEE_IS_WELL_KNOWN_GROUP
#define TRUSTEE_IS_WELL_KNOWN_GROUP 5
#endif
/* Information bits available from the WIN32 FindFirstFile function */
#define APR_FINFO_WIN32_DIR (APR_FINFO_NAME | APR_FINFO_TYPE \
| APR_FINFO_CTIME | APR_FINFO_ATIME \
| APR_FINFO_MTIME | APR_FINFO_SIZE)
/* Sneak the Readonly bit through finfo->protection for internal use _only_ */
#define APR_FREADONLY 0x10000000
/* Private function for apr_stat/lstat/getfileinfo/dir_read */
int fillin_fileinfo(apr_finfo_t *finfo, WIN32_FILE_ATTRIBUTE_DATA *wininfo,
int byhandle, apr_int32_t wanted);
/* Private function that extends apr_stat/lstat/getfileinfo/dir_read */
apr_status_t more_finfo(apr_finfo_t *finfo, const void *ufile,
apr_int32_t wanted, int whatfile);
/* whatfile types for the ufile arg */
#define MORE_OF_HANDLE 0
#define MORE_OF_FSPEC 1
#define MORE_OF_WFSPEC 2
/* quick run-down of fields in windows' apr_file_t structure that may have
* obvious uses.
* fname -- the filename as passed to the open call.
* dwFileAttricutes -- Attributes used to open the file.
* append -- Windows doesn't support the append concept when opening files.
* APR needs to keep track of this, and always make sure we append
* correctly when writing to a file with this flag set TRUE.
*/
// for apr_poll.c;
#define filedes filehand
struct apr_file_t {
apr_pool_t *pool;
HANDLE filehand;
BOOLEAN pipe; // Is this a pipe of a file?
OVERLAPPED *pOverlapped;
apr_interval_time_t timeout;
apr_int32_t flags;
/* File specific info */
apr_finfo_t *finfo;
char *fname;
DWORD dwFileAttributes;
int eof_hit;
BOOLEAN buffered; // Use buffered I/O?
int ungetchar; // Last char provided by an unget op. (-1 = no
char)
int append;
/* Stuff for buffered mode */
char *buffer;
apr_size_t bufpos; // Read/Write position in buffer
apr_size_t dataRead; // amount of valid data read into buffer
int direction; // buffer being used for 0 = read, 1 = write
apr_off_t filePtr; // position in file of handle
apr_thread_mutex_t *mutex; // mutex semaphore, must be owned to access
the above fields
/* Pipe specific info */
};
struct apr_dir_t {
apr_pool_t *pool;
HANDLE dirhand;
apr_size_t rootlen;
char *dirname;
char *name;
union {
#if APR_HAS_UNICODE_FS
struct {
WIN32_FIND_DATAW *entry;
} w;
#endif
#if APR_HAS_ANSI_FS
struct {
WIN32_FIND_DATAA *entry;
} n;
#endif
};
int bof;
};
/* There are many goofy characters the filesystem can't accept
* or can confound the cmd.exe shell. Here's the list
* [declared in filesys.c]
*/
extern const char apr_c_is_fnchar[256];
#define IS_FNCHAR(c) (apr_c_is_fnchar[(unsigned char)(c)] & 1)
#define IS_SHCHAR(c) ((apr_c_is_fnchar[(unsigned char)(c)] & 2) == 2)
/* If the user passes APR_FILEPATH_TRUENAME to either
* apr_filepath_root or apr_filepath_merge, this fn determines
* that the root really exists. It's expensive, wouldn't want
* to do this too frequenly.
*/
apr_status_t filepath_root_test(char *path, apr_pool_t *p);
/* The apr_filepath_merge wants to canonicalize the cwd to the
* addpath if the user passes NULL as the old root path (this
* isn't true of an empty string "", which won't be concatenated.
*
* But we need to figure out what the cwd of a given volume is,
* when the user passes D:foo. This fn will determine D:'s cwd.
*
* If flags includes the bit APR_FILEPATH_NATIVE, the path returned
* is in the os-native format.
*/
apr_status_t filepath_drive_get(char **rootpath, char drive,
apr_int32_t flags, apr_pool_t *p);
/* If the user passes d: vs. D: (or //mach/share vs. //MACH/SHARE),
* we need to fold the case to canonical form. This function is
* supposed to do so.
*/
apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
apr_status_t file_cleanup(void *);
/**
* Internal function to create a Win32/NT pipe that respects some async
* timeout options.
*/
apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out,
BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite,
apr_pool_t *p);
#endif /* ! FILE_IO_H */
1.13 +1 -1 apr/locks/os2/proc_mutex.c
Index: proc_mutex.c
===================================================================
RCS file: /home/cvs/apr/locks/os2/proc_mutex.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- proc_mutex.c 6 Jan 2003 23:44:30 -0000 1.12
+++ proc_mutex.c 7 Jan 2003 00:52:54 -0000 1.13
@@ -57,7 +57,7 @@
#include "apr_strings.h"
#include "apr_portable.h"
#include "apr_arch_proc_mutex.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include <string.h>
#include <stddef.h>
1.7 +1 -1 apr/locks/os2/thread_cond.c
Index: thread_cond.c
===================================================================
RCS file: /home/cvs/apr/locks/os2/thread_cond.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- thread_cond.c 6 Jan 2003 23:44:30 -0000 1.6
+++ thread_cond.c 7 Jan 2003 00:52:54 -0000 1.7
@@ -58,7 +58,7 @@
#include "apr_portable.h"
#include "apr_arch_thread_mutex.h"
#include "apr_arch_thread_cond.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include <string.h>
APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
1.10 +1 -1 apr/locks/os2/thread_mutex.c
Index: thread_mutex.c
===================================================================
RCS file: /home/cvs/apr/locks/os2/thread_mutex.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thread_mutex.c 6 Jan 2003 23:44:30 -0000 1.9
+++ thread_mutex.c 7 Jan 2003 00:52:55 -0000 1.10
@@ -57,7 +57,7 @@
#include "apr_strings.h"
#include "apr_portable.h"
#include "apr_arch_thread_mutex.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include <string.h>
#include <stddef.h>
1.7 +1 -1 apr/locks/os2/thread_rwlock.c
Index: thread_rwlock.c
===================================================================
RCS file: /home/cvs/apr/locks/os2/thread_rwlock.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- thread_rwlock.c 6 Jan 2003 23:44:31 -0000 1.6
+++ thread_rwlock.c 7 Jan 2003 00:52:55 -0000 1.7
@@ -57,7 +57,7 @@
#include "apr_strings.h"
#include "apr_portable.h"
#include "apr_arch_thread_rwlock.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include <string.h>
static apr_status_t thread_rwlock_cleanup(void *therwlock)
1.27 +1 -1 apr/locks/unix/proc_mutex.c
Index: proc_mutex.c
===================================================================
RCS file: /home/cvs/apr/locks/unix/proc_mutex.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- proc_mutex.c 6 Jan 2003 23:44:31 -0000 1.26
+++ proc_mutex.c 7 Jan 2003 00:52:55 -0000 1.27
@@ -55,7 +55,7 @@
#include "apr.h"
#include "apr_strings.h"
#include "apr_arch_proc_mutex.h"
-#include "apr_arch_fileio.h" /* for apr_mkstemp() */
+#include "apr_arch_file_io.h" /* for apr_mkstemp() */
APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex)
{
1.31 +1 -1 apr/misc/unix/otherchild.c
Index: otherchild.c
===================================================================
RCS file: /home/cvs/apr/misc/unix/otherchild.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- otherchild.c 6 Jan 2003 23:44:32 -0000 1.30
+++ otherchild.c 7 Jan 2003 00:52:55 -0000 1.31
@@ -58,7 +58,7 @@
#include "apr_arch_misc.h"
#include "apr_arch_threadproc.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#ifdef HAVE_TIME_H
#include <sys/time.h>
#endif
1.16 +1 -1 apr/misc/win32/apr_app.c
Index: apr_app.c
===================================================================
RCS file: /home/cvs/apr/misc/win32/apr_app.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apr_app.c 6 Jan 2003 23:44:33 -0000 1.15
+++ apr_app.c 7 Jan 2003 00:52:55 -0000 1.16
@@ -75,7 +75,7 @@
#include "ShellAPI.h"
#include "crtdbg.h"
#include "wchar.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "assert.h"
#include "apr_private.h"
#include "apr_arch_misc.h"
1.8 +1 -1 apr/misc/win32/internal.c
Index: internal.c
===================================================================
RCS file: /home/cvs/apr/misc/win32/internal.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- internal.c 6 Jan 2003 23:44:33 -0000 1.7
+++ internal.c 7 Jan 2003 00:52:55 -0000 1.8
@@ -55,7 +55,7 @@
#include "apr_private.h"
#include "apr_arch_misc.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include <crtdbg.h>
#include <assert.h>
1.19 +1 -1 apr/misc/win32/misc.c
Index: misc.c
===================================================================
RCS file: /home/cvs/apr/misc/win32/misc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- misc.c 6 Jan 2003 23:44:33 -0000 1.18
+++ misc.c 7 Jan 2003 00:52:55 -0000 1.19
@@ -55,7 +55,7 @@
#include "apr_private.h"
#include "apr_arch_misc.h"
#include "crtdbg.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "assert.h"
#include "apr_lib.h"
1.45 +1 -1 apr/misc/win32/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apr/misc/win32/start.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- start.c 6 Jan 2003 23:44:33 -0000 1.44
+++ start.c 7 Jan 2003 00:52:55 -0000 1.45
@@ -60,7 +60,7 @@
#include "apr_arch_misc.h" /* for WSAHighByte / WSALowByte */
#include "wchar.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "crtdbg.h"
#include "assert.h"
1.47 +1 -1 apr/mmap/unix/mmap.c
Index: mmap.c
===================================================================
RCS file: /home/cvs/apr/mmap/unix/mmap.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mmap.c 6 Jan 2003 23:44:34 -0000 1.46
+++ mmap.c 7 Jan 2003 00:52:55 -0000 1.47
@@ -58,7 +58,7 @@
#include "apr_strings.h"
#include "apr_mmap.h"
#include "apr_errno.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_portable.h"
/* System headers required for the mmap library */
1.18 +1 -1 apr/mmap/win32/mmap.c
Index: mmap.c
===================================================================
RCS file: /home/cvs/apr/mmap/win32/mmap.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mmap.c 6 Jan 2003 23:44:34 -0000 1.17
+++ mmap.c 7 Jan 2003 00:52:55 -0000 1.18
@@ -57,7 +57,7 @@
#include "apr_general.h"
#include "apr_mmap.h"
#include "apr_errno.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_portable.h"
#include "apr_strings.h"
1.95 +1 -1 apr/network_io/unix/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/sendrecv.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sendrecv.c 6 Jan 2003 23:44:35 -0000 1.94
+++ sendrecv.c 7 Jan 2003 00:52:56 -0000 1.95
@@ -57,7 +57,7 @@
#if APR_HAS_SENDFILE
/* This file is needed to allow us access to the apr_file_t internals. */
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#endif /* APR_HAS_SENDFILE */
/* sys/sysctl.h is only needed on FreeBSD for include_hdrs_in_length() */
1.64 +1 -1 apr/network_io/win32/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/sendrecv.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sendrecv.c 6 Jan 2003 23:44:35 -0000 1.63
+++ sendrecv.c 7 Jan 2003 00:52:56 -0000 1.64
@@ -57,7 +57,7 @@
#include "apr_general.h"
#include "apr_network_io.h"
#include "apr_lib.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#if APR_HAVE_TIME_H
#include <time.h>
#endif
1.38 +1 -1 apr/poll/unix/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apr/poll/unix/poll.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- poll.c 6 Jan 2003 23:44:36 -0000 1.37
+++ poll.c 7 Jan 2003 00:52:56 -0000 1.38
@@ -57,7 +57,7 @@
#include "apr_time.h"
#include "apr_portable.h"
#include "apr_arch_networkio.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#if HAVE_POLL_H
#include <poll.h>
#endif
1.8 +1 -1 apr/poll/unix/pollacc.c
Index: pollacc.c
===================================================================
RCS file: /home/cvs/apr/poll/unix/pollacc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pollacc.c 6 Jan 2003 23:44:36 -0000 1.7
+++ pollacc.c 7 Jan 2003 00:52:56 -0000 1.8
@@ -55,7 +55,7 @@
#include "apr.h"
#include "apr_poll.h"
#include "apr_arch_networkio.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#if HAVE_POLL_H
#include <poll.h>
#endif
1.15 +1 -1 apr/shmem/win32/shm.c
Index: shm.c
===================================================================
RCS file: /home/cvs/apr/shmem/win32/shm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- shm.c 6 Jan 2003 23:44:36 -0000 1.14
+++ shm.c 7 Jan 2003 00:52:56 -0000 1.15
@@ -56,7 +56,7 @@
#include "apr_errno.h"
#include "apr_file_io.h"
#include "apr_shm.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
typedef struct memblock_t {
apr_size_t size;
1.6 +1 -1 apr/support/unix/waitio.c
Index: waitio.c
===================================================================
RCS file: /home/cvs/apr/support/unix/waitio.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- waitio.c 6 Jan 2003 23:44:37 -0000 1.5
+++ waitio.c 7 Jan 2003 00:52:56 -0000 1.6
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_arch_networkio.h"
#include "apr_poll.h"
#include "apr_errno.h"
1.19 +1 -1 apr/threadproc/netware/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apr/threadproc/netware/proc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- proc.c 6 Jan 2003 23:44:37 -0000 1.18
+++ proc.c 7 Jan 2003 00:52:56 -0000 1.19
@@ -53,7 +53,7 @@
*/
#include "apr_arch_threadproc.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_strings.h"
#include "apr_portable.h"
1.55 +1 -1 apr/threadproc/os2/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apr/threadproc/os2/proc.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- proc.c 6 Jan 2003 23:44:38 -0000 1.54
+++ proc.c 7 Jan 2003 00:52:57 -0000 1.55
@@ -56,7 +56,7 @@
#define INCL_DOSERRORS
#include "apr_arch_threadproc.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include "apr_private.h"
#include "apr_thread_proc.h"
#include "apr_file_io.h"
1.37 +1 -1 apr/threadproc/os2/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apr/threadproc/os2/thread.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- thread.c 6 Jan 2003 23:44:38 -0000 1.36
+++ thread.c 7 Jan 2003 00:52:57 -0000 1.37
@@ -59,7 +59,7 @@
#include "apr_general.h"
#include "apr_lib.h"
#include "apr_portable.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#include <stdlib.h>
APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new,
apr_pool_t *pool)
1.21 +1 -1 apr/threadproc/os2/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file: /home/cvs/apr/threadproc/os2/threadpriv.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- threadpriv.c 6 Jan 2003 23:44:38 -0000 1.20
+++ threadpriv.c 7 Jan 2003 00:52:57 -0000 1.21
@@ -58,7 +58,7 @@
#include "apr_general.h"
#include "apr_errno.h"
#include "apr_lib.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key,
void (*dest)(void *),
1.85 +1 -1 apr/threadproc/win32/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apr/threadproc/win32/proc.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- proc.c 6 Jan 2003 23:44:39 -0000 1.84
+++ proc.c 7 Jan 2003 00:52:57 -0000 1.85
@@ -53,7 +53,7 @@
*/
#include "win32/apr_arch_threadproc.h"
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
#include "apr_thread_proc.h"
#include "apr_file_io.h"
1.23 +1 -1 apr/threadproc/win32/signals.c
Index: signals.c
===================================================================
RCS file: /home/cvs/apr/threadproc/win32/signals.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- signals.c 6 Jan 2003 23:44:39 -0000 1.22
+++ signals.c 7 Jan 2003 00:52:57 -0000 1.23
@@ -53,7 +53,7 @@
*/
#include "win32/apr_arch_threadproc.h"
-#include "win32/apr_arch_fileio.h"
+#include "win32/apr_arch_file_io.h"
#include "apr_thread_proc.h"
#include "apr_file_io.h"
#include "apr_general.h"
1.23 +1 -1 apr/user/win32/userinfo.c
Index: userinfo.c
===================================================================
RCS file: /home/cvs/apr/user/win32/userinfo.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- userinfo.c 6 Jan 2003 23:44:40 -0000 1.22
+++ userinfo.c 7 Jan 2003 00:52:57 -0000 1.23
@@ -56,7 +56,7 @@
#include "apr_strings.h"
#include "apr_portable.h"
#include "apr_user.h"
-#include "apr_arch_fileio.h"
+#include "apr_arch_file_io.h"
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
