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

leftovers from when the password was read from stdin.

diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 9e19edfbc062036e70c8ed20b5e66f72101b0f64..cd1bfdae553cb79f459cb989533828170020566d 100644 (file)
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -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
index ff645a945b4d2a2becfcfa74f50960fdc79fc2b4..fe696c970c1c28e1d562f3d3fe5088aa52abb001 100644 (file)
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -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
index a2c729db5d74509403ddf7815e990af011bc7ba5..d0a15f547bdb6df98e83aae35d2d97278b3301e6 100644 (file)
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -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
index 36e843adadbd7b61582241fe6ddc3f43f7aa3b50..014647fde4dcade8a356fd964647977abeadcb55 100644 (file)
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -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
index 8ff24b14ffaac88ea506193717d1aab3b32e300f..8d9fe45cbb0b7ff6388b6181b9132042c15c12bc 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -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
index 6495150cb811b0f0f328ddab233fc4540ca215a4..32fb17e741a49e39c8bb1bf9969b82c567e2c00d 100644 (file)
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -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
index 06c865c08c33e016bef6fcc840fd0719eaaf4d8d..1b0a4b2c5244f2abc8a8823f159de3765caefee2 100644 (file)
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -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);