Only do pkglib_path if needed.

bmomjian · bmomjian · commit 8a911003791e · 2004-05-19T21:17:33.000Z
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.411 2004/05/19 19:39:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.412 2004/05/19 21:17:33 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2190,7 +2190,8 @@ PostgresMain(int argc, char *argv[], const char *username)
 				gettext("%s: could not locate my own executable path"),
 						argv[0]);
 	
-	get_pkglib_path(my_exec_path, pkglib_path);
+	if (pkglib_path[0] == '\0')
+		get_pkglib_path(my_exec_path, pkglib_path);
 
 	/*
 	 * Set default values for command-line options.

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.411 2004/05/19 19:39:27 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.412 2004/05/19 21:17:33 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -2190,7 +2190,8 @@ PostgresMain(int argc, char argv[], const char username)`
`2190`	`2190`	`gettext("%s: could not locate my own executable path"),`
`2191`	`2191`	`argv[0]);`
`2192`	`2192`
`2193`		`- get_pkglib_path(my_exec_path, pkglib_path);`
	`2193`	`+ if (pkglib_path[0] == '\0')`
	`2194`	`+ get_pkglib_path(my_exec_path, pkglib_path);`
`2194`	`2195`
`2195`	`2196`	`/*`
`2196`	`2197`	`* Set default values for command-line options.`