You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2003/11/01 23:06:28 UTC
cvs commit: httpd-2.0/modules/generators mod_autoindex.c
nd 2003/11/01 14:06:28
Modified: modules/generators mod_autoindex.c
Log:
improve readability a (little) bit
Revision Changes Path
1.122 +12 -14 httpd-2.0/modules/generators/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -u -r1.121 -r1.122
--- mod_autoindex.c 3 Sep 2003 19:27:05 -0000 1.121
+++ mod_autoindex.c 1 Nov 2003 22:06:28 -0000 1.122
@@ -1296,22 +1296,20 @@
|| ((dirent->name[1] == '.') && !dirent->name[2])))
return (NULL);
-#ifndef CASE_BLIND_FILESYSTEM
+ /*
+ * On some platforms, the match must be case-blind. This is really
+ * a factor of the filesystem involved, but we can't detect that
+ * reliably - so we have to granularise at the OS level.
+ */
if (pattern && (apr_fnmatch(pattern, dirent->name,
- APR_FNM_NOESCAPE | APR_FNM_PERIOD)
- != APR_SUCCESS))
+ APR_FNM_NOESCAPE | APR_FNM_PERIOD
+#ifdef CASE_BLIND_FILESYSTEM
+ | APR_FNM_CASE_BLIND
+#endif
+ )
+ != APR_SUCCESS)) {
return (NULL);
-#else /* !CASE_BLIND_FILESYSTEM */
- /*
- * On some platforms, the match must be case-blind. This is really
- * a factor of the filesystem involved, but we can't detect that
- * reliably - so we have to granularise at the OS level.
- */
- if (pattern && (apr_fnmatch(pattern, dirent->name,
- APR_FNM_NOESCAPE | APR_FNM_PERIOD | APR_FNM_CASE_BLIND)
- != APR_SUCCESS))
- return (NULL);
-#endif /* !CASE_BLIND_FILESYSTEM */
+ }
if (ignore_entry(d, ap_make_full_path(r->pool,
r->filename, dirent->name))) {