Un-break optarg() call --- some peoples' optarg libraries

tglsfdc · tglsfdc · commit 1764d9579e13 · 1999-09-30T02:17:23.000Z
don't like extraneous colons in the option list...
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.118 1999/09/27 15:47:43 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.119 1999/09/30 02:17:23 tgl Exp $
  *
  * NOTES
  *
@@ -404,7 +404,7 @@ PostmasterMain(int argc, char *argv[])
 	DataDir = getenv("PGDATA"); /* default value */
 
 	opterr = 0;
-	while ((opt = getopt(nonblank_argc, argv, "A:a:B:b:D:i::dm:MN:no:p:Ss")) != EOF)
+	while ((opt = getopt(nonblank_argc, argv, "A:a:B:b:D:di:m:MN:no:p:Ss")) != EOF)
 	{
 		switch (opt)
 		{
@@ -578,12 +578,12 @@ PostmasterMain(int argc, char *argv[])
 
 	if (NetServer)
 	{
-	  status = StreamServerPort(hostName, PostPortName, &ServerSock_INET);
-	  if (status != STATUS_OK)
+		status = StreamServerPort(hostName, PostPortName, &ServerSock_INET);
+		if (status != STATUS_OK)
 	    {
-	      fprintf(stderr, "%s: cannot create INET stream port\n",
-		      progname);
-	      exit(1);
+			fprintf(stderr, "%s: cannot create INET stream port\n",
+					progname);
+			exit(1);
 	    }
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.118 1999/09/27 15:47:43 vadim Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.119 1999/09/30 02:17:23 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`* NOTES`
`16`	`16`	`*`
`@@ -404,7 +404,7 @@ PostmasterMain(int argc, char *argv[])`
`404`	`404`	`DataDir = getenv("PGDATA"); /* default value */`
`405`	`405`
`406`	`406`	`opterr = 0;`
`407`		`- while ((opt = getopt(nonblank_argc, argv, "A:a:B:b:D:i::dm:MN:no:p:Ss")) != EOF)`
	`407`	`+ while ((opt = getopt(nonblank_argc, argv, "A:a:B:b:D:di:m:MN:no:p:Ss")) != EOF)`
`408`	`408`	`{`
`409`	`409`	`switch (opt)`
`410`	`410`	`{`
`@@ -578,12 +578,12 @@ PostmasterMain(int argc, char *argv[])`
`578`	`578`
`579`	`579`	`if (NetServer)`
`580`	`580`	`{`
`581`		`- status = StreamServerPort(hostName, PostPortName, &ServerSock_INET);`
`582`		`- if (status != STATUS_OK)`
	`581`	`+ status = StreamServerPort(hostName, PostPortName, &ServerSock_INET);`
	`582`	`+ if (status != STATUS_OK)`
`583`	`583`	`{`
`584`		`- fprintf(stderr, "%s: cannot create INET stream port\n",`
`585`		`- progname);`
`586`		`- exit(1);`
	`584`	`+ fprintf(stderr, "%s: cannot create INET stream port\n",`
	`585`	`+ progname);`
	`586`	`+ exit(1);`
`587`	`587`	`}`
`588`	`588`	`}`
`589`	`589`