NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit3a2d636

committed

Fix potentially-unportable code in contrib/adminpack.

Spelling access(2)'s second argument as "2" is just horrid.POSIX makes no promises as to the numeric values of W_OK and relatedmacros. Even if it accidentally works as intended on every supportedplatform, 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 foraccess()'s modes, there'd not be an observable behavior differencehere; but I'm being paranoid today.)

1 parentf8a187b commit3a2d636Copy full SHA for 3a2d636

File tree

1 file changed

-2

lines changed

contrib/adminpack
- adminpack.c

1 file changed

-2

lines changed

`‎contrib/adminpack/adminpack.c`

Lines changed: 2 additions & 2 deletions

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,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3a2d636

File tree

1 file changed

1 file changed

`‎contrib/adminpack/adminpack.c`

0 commit comments