postgres -boot would print the wrong program name in event of a

tglsfdc · tglsfdc · commit 9fa1843454c1 · 2005-01-14T21:08:44.000Z
failure in SelectConfigFiles().  Cosmetic issue, but ...
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.197 2004/12/31 21:59:34 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.198 2005/01/14 21:08:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -206,6 +206,7 @@ static IndexList *ILHead = NULL;
 int
 BootstrapMain(int argc, char *argv[])
 {
+	char	   *progname = argv[0];
 	int			i;
 	char	   *dbname;
 	int			flag;
@@ -228,9 +229,9 @@ BootstrapMain(int argc, char *argv[])
 	/* Compute paths, if we didn't inherit them from postmaster */
 	if (my_exec_path[0] == '\0')
 	{
-		if (find_my_exec(argv[0], my_exec_path) < 0)
+		if (find_my_exec(progname, my_exec_path) < 0)
 			elog(FATAL, "%s: could not locate my own executable path",
-				 argv[0]);
+				 progname);
 	}
 
 	/*
@@ -351,7 +352,7 @@ BootstrapMain(int argc, char *argv[])
 	/* Acquire configuration parameters, unless inherited from postmaster */
 	if (!IsUnderPostmaster)
 	{
-		if (!SelectConfigFiles(userDoption, argv[0]))
+		if (!SelectConfigFiles(userDoption, progname))
 			proc_exit(1);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.197 2004/12/31 21:59:34 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.198 2005/01/14 21:08:44 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -206,6 +206,7 @@ static IndexList *ILHead = NULL;`
`206`	`206`	`int`
`207`	`207`	`BootstrapMain(int argc, char *argv[])`
`208`	`208`	`{`
	`209`	`+ char *progname = argv[0];`
`209`	`210`	`int i;`
`210`	`211`	`char *dbname;`
`211`	`212`	`int flag;`
`@@ -228,9 +229,9 @@ BootstrapMain(int argc, char *argv[])`
`228`	`229`	`/* Compute paths, if we didn't inherit them from postmaster */`
`229`	`230`	`if (my_exec_path[0] == '\0')`
`230`	`231`	`{`
`231`		`- if (find_my_exec(argv[0], my_exec_path) < 0)`
	`232`	`+ if (find_my_exec(progname, my_exec_path) < 0)`
`232`	`233`	`elog(FATAL, "%s: could not locate my own executable path",`
`233`		`- argv[0]);`
	`234`	`+ progname);`
`234`	`235`	`}`
`235`	`236`
`236`	`237`	`/*`
`@@ -351,7 +352,7 @@ BootstrapMain(int argc, char *argv[])`
`351`	`352`	`/* Acquire configuration parameters, unless inherited from postmaster */`
`352`	`353`	`if (!IsUnderPostmaster)`
`353`	`354`	`{`
`354`		`- if (!SelectConfigFiles(userDoption, argv[0]))`
	`355`	`+ if (!SelectConfigFiles(userDoption, progname))`
`355`	`356`	`proc_exit(1);`
`356`	`357`	`}`
`357`	`358`