- 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, ".")
-+ if (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")))
- && strcmp(dirent.name, "..")) {
- fnew = (fnames *) apr_array_push(candidates);
- fnew->fname = ap_make_full_path(p, path, dirent.name);
+ candidates = apr_array_make(w->ptemp, 1, sizeof(fnames));
+ while (apr_dir_read(&dirent, APR_FINFO_DIRENT | APR_FINFO_TYPE, dirp) == APR_SUCCESS) {
++ size_t slen;
++ slen = strlen(dirent.name);
+ /* strip out '.' and '..' */
+- if (strcmp(dirent.name, ".")
++ if (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")))
+ && strcmp(dirent.name, "..")
+ && (apr_fnmatch(fname, dirent.name,
+ APR_FNM_PERIOD) == APR_SUCCESS)) {