When under postmaster, bogus arguments should cause proc_exit(0) not

tglsfdc · tglsfdc · commit f1e0044ba391 · 2001-02-24T02:04:51.000Z
proc_exit(1).  Unless you think a system-wide restart is an appropriate
response to bogus PGOPTIONS, that is.
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.207 2001/02/18 04:28:31 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.208 2001/02/24 02:04:51 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1537,7 +1537,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
 		if (errs || argc != optind || DBName == NULL)
 		{
 			fprintf(stderr, "%s: invalid command line arguments\nTry -? for help.\n", argv[0]);
-			proc_exit(1);
+			proc_exit(0);		/* not 1, that causes system-wide restart... */
 		}
 		pq_init();				/* initialize libpq at backend startup */
 		whereToSendOutput = Remote;
@@ -1680,7 +1680,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.207 $ $Date: 2001/02/18 04:28:31 $\n");
+		puts("$Revision: 1.208 $ $Date: 2001/02/24 02:04:51 $\n");
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.207 2001/02/18 04:28:31 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.208 2001/02/24 02:04:51 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -1537,7 +1537,7 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[], const cha`
`1537`	`1537`	`if (errs \|\| argc != optind \|\| DBName == NULL)`
`1538`	`1538`	`{`
`1539`	`1539`	`fprintf(stderr, "%s: invalid command line arguments\nTry -? for help.\n", argv[0]);`
`1540`		`- proc_exit(1);`
	`1540`	`+ proc_exit(0); /* not 1, that causes system-wide restart... */`
`1541`	`1541`	`}`
`1542`	`1542`	`pq_init(); /* initialize libpq at backend startup */`
`1543`	`1543`	`whereToSendOutput = Remote;`
`@@ -1680,7 +1680,7 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[], const cha`
`1680`	`1680`	`if (!IsUnderPostmaster)`
`1681`	`1681`	`{`
`1682`	`1682`	`puts("\nPOSTGRES backend interactive interface ");`
`1683`		`- puts("$Revision: 1.207 $ $Date: 2001/02/18 04:28:31 $\n");`
	`1683`	`+ puts("$Revision: 1.208 $ $Date: 2001/02/24 02:04:51 $\n");`
`1684`	`1684`	`}`
`1685`	`1685`
`1686`	`1686`	`/*`