postgres.git / summary / log / commit / refs

commit    455b8887cf79dc4d4b5fea0cf65f56f316baaaa2
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Thu Nov 22 16:23:24 2012 +0000

    Fix pg_resetxlog to use correct path to postmaster.pid.
    
    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
    eb5949d190e80360386113fde0f05854f0c9824d, so patch all active versions.


 src/bin/pg_resetxlog/pg_resetxlog.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index d5d89ec3ad7..3d9a6698b39 100644
--- 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,13 +251,12 @@ 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);
 		}
 	}
@@ -266,7 +264,7 @@ main(int argc, char *argv[])
 	{
 		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);
 	}
 


[parent: 24c19e6bf96d]