Commit1d863c2

committed

pg_resetwal: Improve error with wrong/missing data directory

Run chdir() before permission check to get a less confusing errormessage if the specified data directory does not exist.Reviewed-by: Aleksander Alekseev <aleksander@timescale.com>Discussion:https://www.postgresql.org/message-id/flat/0f3ab4a1-ae80-56e8-3426-6b4a02507687@eisentraut.org

1 parent7273945 commit1d863c2Copy full SHA for 1d863c2

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -345,17 +345,17 @@ main(int argc, char *argv[])`
`345`	`345`
`346`	`346`	`get_restricted_token();`
`347`	`347`
	`348`	`+if (chdir(DataDir)<0)`
	`349`	`+pg_fatal("could not change directory to \"%s\": %m",`
	`350`	`+DataDir);`
	`351`	`+`
`348`	`352`	`/* Set mask based on PGDATA permissions */`
`349`	`353`	`if (!GetDataDirectoryCreatePerm(DataDir))`
`350`	`354`	`pg_fatal("could not read permissions of directory \"%s\": %m",`
`351`	`355`	`DataDir);`
`352`	`356`
`353`	`357`	`umask(pg_mode_mask);`
`354`	`358`
`355`		`-if (chdir(DataDir)<0)`
`356`		`-pg_fatal("could not change directory to \"%s\": %m",`
`357`		`-DataDir);`
`358`		`-`
`359`	`359`	`/* Check that data directory matches our server version */`
`360`	`360`	`CheckDataVersion();`
`361`	`361`

Comments

(0)