Fix pg_update to properly test for the data directory's existence on

bmomjian · bmomjian · commit a31dc392d684 · 2011-07-30T01:50:55.000-04:00
Win32.

Backpatch to 9.1.
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
@@ -168,7 +168,9 @@ check_data_dir(const char *pg_data)
 	{
 		struct stat statBuf;
 
-		snprintf(subDirName, sizeof(subDirName), "%s/%s", pg_data,
+		snprintf(subDirName, sizeof(subDirName), "%s%s%s", pg_data,
+			/* Win32 can't stat() a directory with a trailing slash. */
+				 *requiredSubdirs[subdirnum] ? "/" : "",
 				 requiredSubdirs[subdirnum]);
 
 		if (stat(subDirName, &statBuf) != 0)

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,9 @@ check_data_dir(const char *pg_data)`
`168`	`168`	`{`
`169`	`169`	`struct stat statBuf;`
`170`	`170`
`171`		`- snprintf(subDirName, sizeof(subDirName), "%s/%s", pg_data,`
	`171`	`+ snprintf(subDirName, sizeof(subDirName), "%s%s%s", pg_data,`
	`172`	`+ /* Win32 can't stat() a directory with a trailing slash. */`
	`173`	`+ *requiredSubdirs[subdirnum] ? "/" : "",`
`172`	`174`	`requiredSubdirs[subdirnum]);`
`173`	`175`
`174`	`176`	`if (stat(subDirName, &statBuf) != 0)`