Ignore PGPORT environment variable if it is an empty string.

tglsfdc · tglsfdc · commit 45f92179d921 · 2000-12-31T18:15:58.000Z
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.156 2000/12/22 07:59:32 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.157 2000/12/31 18:15:58 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -440,7 +440,8 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions,
 
 	if (pgport == NULL || pgport[0] == '\0')
 	{
-		if ((tmp = getenv("PGPORT")) == NULL)
+		tmp = getenv("PGPORT");
+		if (tmp == NULL || tmp[0] == '\0')
 			tmp = DEF_PGPORT_STR;
 		conn->pgport = strdup(tmp);
 	}

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/interfaces/libpq/fe-connect.c,v 1.156 2000/12/22 07:59:32 ishii Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.157 2000/12/31 18:15:58 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -440,7 +440,8 @@ PQsetdbLogin(const char pghost, const char pgport, const char *pgoptions,`
`440`	`440`
`441`	`441`	`if (pgport == NULL \|\| pgport[0] == '\0')`
`442`	`442`	`{`
`443`		`- if ((tmp = getenv("PGPORT")) == NULL)`
	`443`	`+ tmp = getenv("PGPORT");`
	`444`	`+ if (tmp == NULL \|\| tmp[0] == '\0')`
`444`	`445`	`tmp = DEF_PGPORT_STR;`
`445`	`446`	`conn->pgport = strdup(tmp);`
`446`	`447`	`}`