Fix pg_resetxlog to use correct path to postmaster.pid.

tglsfdc · tglsfdc · commit 455b8887cf79 · 2012-11-22T11:24:29.000-05:00
Since we've already chdir'd into the data directory, the file should be referenced as just "postmaster.pid", without prefixing the directory path. This is harmless in the normal case where an absolute PGDATA path is used, but quite dangerous if a relative path is specified, since the program might then fail to notice an active postmaster. Reported by Hari Babu. This got broken in my commit eb5949d, so patch all active versions.
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -91,7 +91,6 @@ main(int argc, char *argv[])
 	char	   *endptr;
 	char	   *DataDir;
 	int			fd;
-	char		path[MAXPGPATH];
 
 	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_resetxlog"));
 
@@ -252,21 +251,20 @@ main(int argc, char *argv[])
 	 * Check for a postmaster lock file --- if there is one, refuse to
 	 * proceed, on grounds we might be interfering with a live installation.
 	 */
-	snprintf(path, MAXPGPATH, "%s/postmaster.pid", DataDir);
-
-	if ((fd = open(path, O_RDONLY, 0)) < 0)
+	if ((fd = open("postmaster.pid", O_RDONLY, 0)) < 0)
 	{
 		if (errno != ENOENT)
 		{
-			fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"), progname, path, strerror(errno));
+			fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
+					progname, "postmaster.pid", strerror(errno));
 			exit(1);
 		}
 	}
 	else
 	{
 		fprintf(stderr, _("%s: lock file \"%s\" exists\n"
 						  "Is a server running?  If not, delete the lock file and try again.\n"),
-				progname, path);
+				progname, "postmaster.pid");
 		exit(1);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,6 @@ main(int argc, char *argv[])`
`91`	`91`	`char *endptr;`
`92`	`92`	`char *DataDir;`
`93`	`93`	`int fd;`
`94`		`- char path[MAXPGPATH];`
`95`	`94`
`96`	`95`	`set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_resetxlog"));`
`97`	`96`
`@@ -252,21 +251,20 @@ main(int argc, char *argv[])`
`252`	`251`	`* Check for a postmaster lock file --- if there is one, refuse to`
`253`	`252`	`* proceed, on grounds we might be interfering with a live installation.`
`254`	`253`	`*/`
`255`		`- snprintf(path, MAXPGPATH, "%s/postmaster.pid", DataDir);`
`256`		`-`
`257`		`- if ((fd = open(path, O_RDONLY, 0)) < 0)`
	`254`	`+ if ((fd = open("postmaster.pid", O_RDONLY, 0)) < 0)`
`258`	`255`	`{`
`259`	`256`	`if (errno != ENOENT)`
`260`	`257`	`{`
`261`		`- fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"), progname, path, strerror(errno));`
	`258`	`+ fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),`
	`259`	`+ progname, "postmaster.pid", strerror(errno));`
`262`	`260`	`exit(1);`
`263`	`261`	`}`
`264`	`262`	`}`
`265`	`263`	`else`
`266`	`264`	`{`
`267`	`265`	`fprintf(stderr, _("%s: lock file \"%s\" exists\n"`
`268`	`266`	`"Is a server running? If not, delete the lock file and try again.\n"),`
`269`		`- progname, path);`
	`267`	`+ progname, "postmaster.pid");`
`270`	`268`	`exit(1);`
`271`	`269`	`}`
`272`	`270`