pg_resetwal: Improve error with wrong/missing data directory

petere · petere · commit 1d863c250461 · 2023-09-28T11:40:00.000+02:00
Run chdir() before permission check to get a less confusing error message 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
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
@@ -345,17 +345,17 @@ main(int argc, char *argv[])
 
 	get_restricted_token();
 
+	if (chdir(DataDir) < 0)
+		pg_fatal("could not change directory to \"%s\": %m",
+				 DataDir);
+
 	/* Set mask based on PGDATA permissions */
 	if (!GetDataDirectoryCreatePerm(DataDir))
 		pg_fatal("could not read permissions of directory \"%s\": %m",
 				 DataDir);
 
 	umask(pg_mode_mask);
 
-	if (chdir(DataDir) < 0)
-		pg_fatal("could not change directory to \"%s\": %m",
-				 DataDir);
-
 	/* Check that data directory matches our server version */
 	CheckDataVersion();
 
