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

bmomjian · bmomjian · commit 663e27c405a0 · 2011-11-17T13:40:45.000-05:00
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
@@ -294,7 +294,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++;
 

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ pg_scandir_internal(const char *dirname,`
`294`	`294`	`while ((direntry = readdir(dirdesc)) != NULL)`
`295`	`295`	`{`
`296`	`296`	`/* Invoke the selector function to see if the direntry matches */`
`297`		`- if (selector && (*selector) (direntry))`
	`297`	`+ if (!selector \|\| (*selector) (direntry))`
`298`	`298`	`{`
`299`	`299`	`count++;`
`300`	`300`