- a2

[packages/apache.git] / apache-configdir_skip_backups.patch

diff --git a/apache-configdir_skip_backups.patch b/apache-configdir_skip_backups.patch
index 68233e4caf6eea66040de4da91de8c4df5f2d336..558f6b33ddad6c113be97e52bcb02aed65681b5d 100644 (file)
--- a/apache-configdir_skip_backups.patch
+++ b/apache-configdir_skip_backups.patch
@@ -1,35 +1,26 @@
---- apache_1.3.17/src/main/http_config.c.wiget Thu May 10 14:41:08 2001
-+++ apache_1.3.17/src/main/http_config.c       Thu May 10 15:42:12 2001
-@@ -1287,6 +1287,7 @@
-       DIR *dirp;
-       struct DIR_TYPE *dir_entry;
-       int current;
+--- httpd-2.0.42/server/config.c.wiget Thu Sep 12 22:04:07 2002
++++ httpd-2.0.42/server/config.c       Wed Sep 25 12:07:10 2002
+@@ -1458,6 +1458,7 @@
+         apr_dir_t *dirp;
+         apr_finfo_t dirent;
+         int current;
 +      size_t slen;
-       array_header *candidates = NULL;
-       fnames *fnew;
+         apr_array_header_t *candidates = NULL;
+         fnames *fnew;
+         apr_status_t rv;
+@@ -1505,9 +1506,15 @@
  
-@@ -1309,13 +1310,21 @@
-       }
-       candidates = ap_make_array(p, 1, sizeof(fnames));
-       while ((dir_entry = readdir(dirp)) != NULL) {
-+          slen = strlen(dir_entry->d_name);
-           /* strip out '.' and '..' */
-           if (strcmp(dir_entry->d_name, ".") &&
-               strcmp(dir_entry->d_name, "..") &&
-                 (!ispatt ||
--                 !ap_fnmatch(pattern,dir_entry->d_name, FNM_PERIOD)) ) {
--              fnew = (fnames *) ap_push_array(candidates);
--              fnew->fname = ap_make_full_path(p, path, dir_entry->d_name);
-+                !ap_fnmatch(pattern,dir_entry->d_name, FNM_PERIOD)) &&
-+              (dir_entry->d_name)[slen-1] != '~') {
-+                  if (slen < 8 || strcmp((dir_entry->d_name + slen - 7), ".rpmnew")) {
-+                          if (slen < 9 || 
-+                              strcmp((dir_entry->d_name + slen - 8), ".rpmorig") && 
-+                              strcmp((dir_entry->d_name + slen - 8), ".rpmsave")) {
-+                                  fnew = (fnames *) ap_push_array(candidates);
-+                                  fnew->fname = ap_make_full_path(p, path, dir_entry->d_name);
-+                          }
-+                  }
-           }
-       }
-       ap_pclosedir(p, dirp);
+         candidates = apr_array_make(p, 1, sizeof(fnames));
+         while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
++              slen = strlen(dirent.name);
+             /* strip out '.' and '..' */
+             if (strcmp(dirent.name, ".")
+                 && strcmp(dirent.name, "..")
++                              && (dirent.name)[slen-1] != '~' 
++                              && (dirent.name)[0] != '.'
++                              && (slen < 8 || strcmp((dirent.name + slen - 7), ".rpmnew")) 
++                              && (slen < 9 || ( strcmp((dirent.name + slen - 8), ".rpmorig") 
++                                              && strcmp((dirent.name + slen - 8), ".rpmsave")))
+                 && (!ispatt ||
+                     apr_fnmatch(pattern, dirent.name, 
+                                 FNM_PERIOD) == APR_SUCCESS)) {