- taken from apache1

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

diff --git a/apache-configdir_skip_backups.patch b/apache-configdir_skip_backups.patch
index 3419c2e22911ccdfff46fc948ac12b552685cd5e..68233e4caf6eea66040de4da91de8c4df5f2d336 100644 (file)
--- a/apache-configdir_skip_backups.patch
+++ b/apache-configdir_skip_backups.patch
@@ -8,24 +8,26 @@
        array_header *candidates = NULL;
        fnames *fnew;
  
-@@ -1309,11 +1310,19 @@
+@@ -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, "..")) {
+               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, fname, dir_entry->d_name);
-+              strcmp(dir_entry->d_name, "..") &&
+-              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, fname, dir_entry->d_name);
++                                  fnew->fname = ap_make_full_path(p, path, dir_entry->d_name);
 +                          }
 +                  }
            }