diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2002-03-01 05:56:26 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2002-03-01 05:56:26 +0000 |
| commit | f84b5a8b0b36229c7a94b5744ecd5fbede93d069 (patch) | |
| tree | 383d546d250811fa6ff06d23dfb0669d25c17fd6 /threadproc/win32/proc.c | |
| parent | a164d37ce1c89e04c44c20b43434e310687acfe7 (diff) | |
| download | libapr-f84b5a8b0b36229c7a94b5744ecd5fbede93d069.tar.gz | |
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]
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63074 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc/win32/proc.c')
| -rw-r--r-- | threadproc/win32/proc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/threadproc/win32/proc.c b/threadproc/win32/proc.c index 725ca615a..18f02c84f 100644 --- a/threadproc/win32/proc.c +++ b/threadproc/win32/proc.c @@ -264,13 +264,8 @@ APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr, /* 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, |