Fix pg_ctl bug where detection of binary location from postmaster.opts

bmomjian · bmomjian · commit 4688e6d9cb50 · 2008-06-26T18:25:24.000Z
wasn't working.
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.102 2008/06/26 03:51:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.103 2008/06/26 18:25:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -610,7 +610,7 @@ read_post_opts(void)
 					*arg1 = '\0';	/* terminate so we get only program name */
 					post_opts = arg1 + 1; /* point past whitespace */
 				}
-				if (postgres_path != NULL)
+				if (postgres_path == NULL)
 					postgres_path = optline;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.102 2008/06/26 03:51:56 momjian Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.103 2008/06/26 18:25:24 momjian Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -610,7 +610,7 @@ read_post_opts(void)`
`610`	`610`	`arg1 = '\0'; / terminate so we get only program name */`
`611`	`611`	`post_opts = arg1 + 1; /* point past whitespace */`
`612`	`612`	`}`
`613`		`- if (postgres_path != NULL)`
	`613`	`+ if (postgres_path == NULL)`
`614`	`614`	`postgres_path = optline;`
`615`	`615`	`}`
`616`	`616`	`}`