brane 01/09/10 12:08:35
Modified: file_io/win32 filepath.c
Log:
(apr_filepath_merge): Pass the APR_FILEPATH_NATIVE flag to
apr_filepath_root if it's set in flags.
Revision Changes Path
1.14 +8 -3 apr/file_io/win32/filepath.c
Index: filepath.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/filepath.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- filepath.c 2001/09/09 06:03:05 1.13
+++ filepath.c 2001/09/10 19:08:35 1.14
@@ -358,7 +358,9 @@
/* This call _should_ test the path
*/
addtype = apr_filepath_root(&addroot, &addpath,
- APR_FILEPATH_TRUENAME, p);
+ APR_FILEPATH_TRUENAME
+ | (flags & APR_FILEPATH_NATIVE),
+ p);
if (addtype == APR_SUCCESS) {
addtype = APR_EABSOLUTE;
}
@@ -430,7 +432,8 @@
if (!baseroot) {
/* This call should _not_ test the path
*/
- basetype = apr_filepath_root(&baseroot, &basepath, 0, p);
+ basetype = apr_filepath_root(&baseroot, &basepath,
+ (flags & APR_FILEPATH_NATIVE), p);
if (basetype == APR_SUCCESS) {
basetype = APR_EABSOLUTE;
}
@@ -745,7 +748,9 @@
/* This call _should_ test the path
*/
testtype = apr_filepath_root(&testroot, &testpath,
- APR_FILEPATH_TRUENAME, p);
+ APR_FILEPATH_TRUENAME
+ | (flags & APR_FILEPATH_NATIVE),
+ p);
if (testtype == APR_SUCCESS) {
rootlen = pathlen = (testpath - path);
memcpy(path, testroot, pathlen);
