From: Bruce Momjian Date: Thu, 26 Jun 2008 18:25:24 +0000 (+0000) Subject: Fix pg_ctl bug where detection of binary location from postmaster.opts X-Git-Tag: REL8_4_BETA1~1239 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4688e6d9cb50c1ca8112060f46103927e757ed45;p=thirdparty%2Fpostgresql.git Fix pg_ctl bug where detection of binary location from postmaster.opts wasn't working. --- diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index 58fae74adee..f90bf29bed4 100644 --- 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; } }