Simplify 'pg_ctl restart' detection of first argument in

postmaster.opts.

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 310d1775d2b154fe18e99267e3617c0ad6515b0e..58fae74adee61b2239c151b25480491e5faf0993 100644 (file)
--- 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.101 2008/06/26 02:47:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.102 2008/06/26 03:51:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -601,18 +601,14 @@ read_post_opts(void)
                                len = strcspn(optline, "\r\n");
                                optline[len] = '\0';
 
-                               for (arg1 = optline; *arg1; arg1++)
+                               /*
+                                * Are we at the first option, as defined by space and
+                                * double-quote?
+                                */
+                               if ((arg1 = strstr(optline, " \"")) != NULL)
                                {
-                                       /*
-                                        * Are we at the first option, as defined by space,
-                                        * double-quote, and a dash?
-                                        */
-                                       if (*arg1 == ' ' && *(arg1+1) == '"' && *(arg1+2) == '-')
-                                       {
-                                               *arg1 = '\0';   /* terminate so we get only program name */
-                                               post_opts = arg1 + 1; /* point past whitespace */
-                                               break;
-                                       }
+                                       *arg1 = '\0';   /* terminate so we get only program name */
+                                       post_opts = arg1 + 1; /* point past whitespace */
                                }
                                if (postgres_path != NULL)
                                        postgres_path = optline;