summaryrefslogtreecommitdiff
path: root/include/apr_file_info.h
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2002-12-28 20:41:58 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2002-12-28 20:41:58 +0000
commit720a986a39d5985e5eafb087104e0ef6ded20056 (patch)
treebf5771423f83da21df7c5a73665cca901786e7ff /include/apr_file_info.h
parentbbdea4bfd38183af2564cb498b636208deddc50b (diff)
downloadlibapr-720a986a39d5985e5eafb087104e0ef6ded20056.tar.gz
Grudgingly accept that folks may want to merge paths containing wildcard
characters... fail similarly to ENOENT/ENOTDIR, where we return the path but emit the error as a precaution. Folks interested in the results of an invalid path merge need to look for those APR_STATUS_IS_xxx() results. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64213 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr_file_info.h')
-rw-r--r--include/apr_file_info.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/apr_file_info.h b/include/apr_file_info.h
index 2a6d0802e..717858d9e 100644
--- a/include/apr_file_info.h
+++ b/include/apr_file_info.h
@@ -373,6 +373,11 @@ APR_DECLARE(apr_status_t) apr_filepath_root(const char **rootpath,
* @param flags the desired APR_FILEPATH_ rules to apply when merging
* @param p the pool to allocate the new path string from
* @deffunc apr_status_t apr_filepath_merge(char **newpath, const char *rootpath, const char *addpath, apr_int32_t flags, apr_pool_t *p)
+ * @remark if the flag APR_FILEPATH_TRUENAME is given, and the addpath
+ * contains wildcard characters ('*', '?') on platforms that don't support
+ * such characters within filenames, the paths will be merged, but the
+ * result code will be APR_EPATHWILD, and all further segments will not
+ * reflect the true filenames including the wildcard and following segments.
*/
APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath,
const char *rootpath,