Revert "pg_resetwal: Improve error with wrong/missing data directory"

petere · petere · commit 5daa50f962bd · 2023-09-29T10:59:46.000+02:00
This reverts commit 1d863c2. This broke specifying the data directory as a relative path. Reported-by: Hayato Kuroda (Fujitsu) <kuroda.hayato@fujitsu.com> Discussion: https://www.postgresql.org/message-id/flat/TYAPR01MB58664AD301F511B1EA5B72B4F5C0A%40TYAPR01MB5866.jpnprd01.prod.outlook.com
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();
 
