wrowe 02/02/28 21:56:27
Modified: threadproc/win32 proc.c
Log:
Oh ... yea, there is a reason I never committed this months-old code
to CVS - reverting to 1.63. Although the theory is right - we could
end up in a case of d:\ or \\unc\path\ where stripping off the trailing
slash of a root will introduce erratic behavior or fail entirely.
Needs to be conditional on not-a-root-path, and I don't have time to
hack that tonight. Better to leave working code in CVS. [sorry]
Revision Changes Path
1.65 +2 -7 apr/threadproc/win32/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apr/threadproc/win32/proc.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- proc.c 1 Mar 2002 05:53:23 -0000 1.64
+++ proc.c 1 Mar 2002 05:56:26 -0000 1.65
@@ -264,13 +264,8 @@
/* curr dir must be in native format, there are all sorts of bugs in
* the NT library loading code that flunk the '/' parsing test.
*/
- apr_status_t rv = apr_filepath_merge(&attr->currdir, NULL, dir,
- APR_FILEPATH_NATIVE, attr->cntxt);
- if (rv == APR_SUCCESS) {
- if (attr->currdir[strlen(attr->currdir) - 1] == '\\')
- attr->currdir[strlen(attr->currdir) - 1] = '\0';
- }
- return rv;
+ return apr_filepath_merge(&attr->currdir, NULL, dir,
+ APR_FILEPATH_NATIVE, attr->cntxt);
}
APR_DECLARE(apr_status_t) apr_procattr_cmdtype_set(apr_procattr_t *attr,
