Fix pg_upgrade's pg_scandir_internal() the right way. Backpatch to 9.1.

diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
index d3b0eaf2e28d39e0657e5272f22863dbab706587..b414769917f3250b7ddc10e30b7f54a1f19be243 100644 (file)
--- a/contrib/pg_upgrade/file.c
+++ b/contrib/pg_upgrade/file.c
@@ -296,7 +296,7 @@ pg_scandir_internal(const char *dirname,
    while ((direntry = readdir(dirdesc)) != NULL)
    {
        /* Invoke the selector function to see if the direntry matches */
-       if (selector && (*selector) (direntry))
+       if (!selector || (*selector) (direntry))
        {
            count++;