Fix potentially-unportable code in contrib/adminpack.

tglsfdc · tglsfdc · commit 3a2d6365984d · 2018-04-15T13:02:11.000-04:00
Spelling access(2)'s second argument as "2" is just horrid.
POSIX makes no promises as to the numeric values of W_OK and related
macros.  Even if it accidentally works as intended on every supported
platform, it's still unreadable and inconsistent with adjacent code.

In passing, don't spell "NULL" as "0" either.  Yes, that's legal C;
no, it's not project style.

Back-patch, just in case the unportability is real and not theoretical.
(Most likely, even if a platform had different bit assignments for
access()'s modes, there'd not be an observable behavior difference
here; but I'm being paranoid today.)
diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c
@@ -298,7 +298,7 @@ pg_file_rename_internal(text *file1, text *file2, text *file3)
 	fn2 = convert_and_check_filename(file2, false);
 
 	if (file3 == NULL)
-		fn3 = 0;
+		fn3 = NULL;
 	else
 		fn3 = convert_and_check_filename(file3, false);
 
@@ -320,7 +320,7 @@ pg_file_rename_internal(text *file1, text *file2, text *file3)
 		return false;
 	}
 
-	rc = access(fn3 ? fn3 : fn2, 2);
+	rc = access(fn3 ? fn3 : fn2, W_OK);
 	if (rc >= 0 || errno != ENOENT)
 	{
 		ereport(ERROR,

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ pg_file_rename_internal(text file1, text file2, text *file3)`
`298`	`298`	`fn2 = convert_and_check_filename(file2, false);`
`299`	`299`
`300`	`300`	`if (file3 == NULL)`
`301`		`- fn3 = 0;`
	`301`	`+ fn3 = NULL;`
`302`	`302`	`else`
`303`	`303`	`fn3 = convert_and_check_filename(file3, false);`
`304`	`304`
`@@ -320,7 +320,7 @@ pg_file_rename_internal(text file1, text file2, text *file3)`
`320`	`320`	`return false;`
`321`	`321`	`}`
`322`	`322`
`323`		`- rc = access(fn3 ? fn3 : fn2, 2);`
	`323`	`+ rc = access(fn3 ? fn3 : fn2, W_OK);`
`324`	`324`	`if (rc >= 0 \|\| errno != ENOENT)`
`325`	`325`	`{`
`326`	`326`	`ereport(ERROR,`