summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2009-02-25 13:24:40 +0000
committerPeter Eisentraut2009-02-25 13:24:40 +0000
commite6f11f6e5a792510c93cbb2b2255086d9eda6233 (patch)
tree701a40ab383ef009bfe3425ea894625dc59a3766
parentbbf54130858694c6f31794a11bf505739dfb0c5b (diff)
Remove feof(stdin) calls related to when to prompt for a password,
leftovers from when the password was read from stdin.
-rw-r--r--contrib/oid2name/oid2name.c3
-rw-r--r--contrib/pgbench/pgbench.c3
-rw-r--r--contrib/vacuumlo/vacuumlo.c3
-rw-r--r--src/bin/pg_dump/pg_backup_db.c3
-rw-r--r--src/bin/pg_dump/pg_dumpall.c3
-rw-r--r--src/bin/psql/startup.c3
-rw-r--r--src/bin/scripts/common.c3
7 files changed, 7 insertions, 14 deletions
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 9e19edfbc0..cd1bfdae55 100644
--- 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 ff645a945b..fe696c970c 100644
--- 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 a2c729db5d..d0a15f547b 100644
--- 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 36e843adad..014647fde4 100644
--- 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 8ff24b14ff..8d9fe45cbb 100644
--- 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 6495150cb8..32fb17e741 100644
--- 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 06c865c08c..1b0a4b2c52 100644
--- 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);