Remove feof(stdin) calls related to when to prompt for a password,

petere · petere · commit a3c502c89f62 · 2009-02-25T13:24:40.000Z
leftovers from when the password was read from stdin.
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
@@ -5,7 +5,7 @@
  * Originally by
  * B. Palmer, bpalmer@crimelabs.net 1-17-2001
  *
- * $PostgreSQL: pgsql/contrib/oid2name/oid2name.c,v 1.33 2007/12/11 02:31:49 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/oid2name/oid2name.c,v 1.34 2009/02/25 13:24:40 petere Exp $
  */
 #include "postgres_fe.h"
 
@@ -293,8 +293,7 @@ sql_conn(struct options * my_opts)
 
 		if (PQstatus(conn) == CONNECTION_BAD &&
 			PQconnectionNeedsPassword(conn) &&
-			password == NULL &&
-			!feof(stdin))
+			password == NULL)
 		{
 			PQfinish(conn);
 			password = simple_prompt("Password: ", 100, false);
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
@@ -4,7 +4,7 @@
  * A simple benchmark program for PostgreSQL
  * Originally written by Tatsuo Ishii and enhanced by many contributors.
  *
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.83 2009/01/01 17:23:32 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.84 2009/02/25 13:24:40 petere Exp $
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -309,8 +309,7 @@ doConnect(void)
 
 		if (PQstatus(conn) == CONNECTION_BAD &&
 			PQconnectionNeedsPassword(conn) &&
-			password == NULL &&
-			!feof(stdin))
+			password == NULL)
 		{
 			PQfinish(conn);
 			password = simple_prompt("Password: ", 100, false);
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.37 2009/01/01 17:23:32 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.38 2009/02/25 13:24:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -91,8 +91,7 @@ vacuumlo(char *database, struct _param * param)
 
 		if (PQstatus(conn) == CONNECTION_BAD &&
 			PQconnectionNeedsPassword(conn) &&
-			password == NULL &&
-			!feof(stdin))
+			password == NULL)
 		{
 			PQfinish(conn);
 			password = simple_prompt("Password: ", 100, false);
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
@@ -5,7 +5,7 @@
  *	Implements the basic DB functions used by the archiver.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.81 2009/02/02 20:07:37 adunstan Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.82 2009/02/25 13:24:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -241,8 +241,7 @@ ConnectDatabase(Archive *AHX,
 
 		if (PQstatus(AH->connection) == CONNECTION_BAD &&
 			PQconnectionNeedsPassword(AH->connection) &&
-			password == NULL &&
-			!feof(stdin))
+			password == NULL)
 		{
 			PQfinish(AH->connection);
 			password = simple_prompt("Password: ", 100, false);
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.116 2009/02/25 13:03:06 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.117 2009/02/25 13:24:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1358,8 +1358,7 @@ connectDatabase(const char *dbname, const char *pghost, const char *pgport,
 
 		if (PQstatus(conn) == CONNECTION_BAD &&
 			PQconnectionNeedsPassword(conn) &&
-			password == NULL &&
-			!feof(stdin))
+			password == NULL)
 		{
 			PQfinish(conn);
 			password = simple_prompt("Password: ", 100, false);
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.153 2009/01/01 17:23:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.154 2009/02/25 13:24:40 petere Exp $
  */
 #include "postgres_fe.h"
 
@@ -189,8 +189,7 @@ main(int argc, char *argv[])
 
 		if (PQstatus(pset.db) == CONNECTION_BAD &&
 			PQconnectionNeedsPassword(pset.db) &&
-			password == NULL &&
-			!feof(stdin))
+			password == NULL)
 		{
 			PQfinish(pset.db);
 			password = simple_prompt(password_prompt, 100, false);
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.33 2009/01/01 17:23:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.34 2009/02/25 13:24:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -124,8 +124,7 @@ connectDatabase(const char *dbname, const char *pghost, const char *pgport,
 
 		if (PQstatus(conn) == CONNECTION_BAD &&
 			PQconnectionNeedsPassword(conn) &&
-			password == NULL &&
-			!feof(stdin))
+			password == NULL)
 		{
 			PQfinish(conn);
 			password = simple_prompt("Password: ", 100, false);

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* A simple benchmark program for PostgreSQL`
`5`	`5`	`* Originally written by Tatsuo Ishii and enhanced by many contributors.`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.83 2009/01/01 17:23:32 momjian Exp $`
	`7`	`+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.84 2009/02/25 13:24:40 petere Exp $`
`8`	`8`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`9`	`9`	`* ALL RIGHTS RESERVED;`
`10`	`10`	`*`
`@@ -309,8 +309,7 @@ doConnect(void)`
`309`	`309`
`310`	`310`	`if (PQstatus(conn) == CONNECTION_BAD &&`
`311`	`311`	`PQconnectionNeedsPassword(conn) &&`
`312`		`- password == NULL &&`
`313`		`- !feof(stdin))`
	`312`	`+ password == NULL)`
`314`	`313`	`{`
`315`	`314`	`PQfinish(conn);`
`316`	`315`	`password = simple_prompt("Password: ", 100, false);`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.37 2009/01/01 17:23:32 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.38 2009/02/25 13:24:40 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -91,8 +91,7 @@ vacuumlo(char database, struct _param param)`
`91`	`91`
`92`	`92`	`if (PQstatus(conn) == CONNECTION_BAD &&`
`93`	`93`	`PQconnectionNeedsPassword(conn) &&`
`94`		`- password == NULL &&`
`95`		`- !feof(stdin))`
	`94`	`+ password == NULL)`
`96`	`95`	`{`
`97`	`96`	`PQfinish(conn);`
`98`	`97`	`password = simple_prompt("Password: ", 100, false);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* Implements the basic DB functions used by the archiver.`
`6`	`6`	`*`
`7`	`7`	`* IDENTIFICATION`
`8`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.81 2009/02/02 20:07:37 adunstan Exp $`
	`8`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.82 2009/02/25 13:24:40 petere Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -241,8 +241,7 @@ ConnectDatabase(Archive *AHX,`
`241`	`241`
`242`	`242`	`if (PQstatus(AH->connection) == CONNECTION_BAD &&`
`243`	`243`	`PQconnectionNeedsPassword(AH->connection) &&`
`244`		`- password == NULL &&`
`245`		`- !feof(stdin))`
	`244`	`+ password == NULL)`
`246`	`245`	`{`
`247`	`246`	`PQfinish(AH->connection);`
`248`	`247`	`password = simple_prompt("Password: ", 100, false);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.116 2009/02/25 13:03:06 petere Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.117 2009/02/25 13:24:40 petere Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -1358,8 +1358,7 @@ connectDatabase(const char dbname, const char pghost, const char *pgport,`
`1358`	`1358`
`1359`	`1359`	`if (PQstatus(conn) == CONNECTION_BAD &&`
`1360`	`1360`	`PQconnectionNeedsPassword(conn) &&`
`1361`		`- password == NULL &&`
`1362`		`- !feof(stdin))`
	`1361`	`+ password == NULL)`
`1363`	`1362`	`{`
`1364`	`1363`	`PQfinish(conn);`
`1365`	`1364`	`password = simple_prompt("Password: ", 100, false);`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.153 2009/01/01 17:23:55 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.154 2009/02/25 13:24:40 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -189,8 +189,7 @@ main(int argc, char *argv[])`
`189`	`189`
`190`	`190`	`if (PQstatus(pset.db) == CONNECTION_BAD &&`
`191`	`191`	`PQconnectionNeedsPassword(pset.db) &&`
`192`		`- password == NULL &&`
`193`		`- !feof(stdin))`
	`192`	`+ password == NULL)`
`194`	`193`	`{`
`195`	`194`	`PQfinish(pset.db);`
`196`	`195`	`password = simple_prompt(password_prompt, 100, false);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.33 2009/01/01 17:23:55 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.34 2009/02/25 13:24:40 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -124,8 +124,7 @@ connectDatabase(const char dbname, const char pghost, const char *pgport,`
`124`	`124`
`125`	`125`	`if (PQstatus(conn) == CONNECTION_BAD &&`
`126`	`126`	`PQconnectionNeedsPassword(conn) &&`
`127`		`- password == NULL &&`
`128`		`- !feof(stdin))`
	`127`	`+ password == NULL)`
`129`	`128`	`{`
`130`	`129`	`PQfinish(conn);`
`131`	`130`	`password = simple_prompt("Password: ", 100, false);`