From a3c502c89f624aed5ee9f6e896740f86a28cc50e Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 25 Feb 2009 13:24:40 +0000
Subject: [PATCH] Remove feof(stdin) calls related to when to prompt for a
password, leftovers from when the password was read from stdin.
---
contrib/oid2name/oid2name.c | 5 ++---
contrib/pgbench/pgbench.c | 5 ++---
contrib/vacuumlo/vacuumlo.c | 5 ++---
src/bin/pg_dump/pg_backup_db.c | 5 ++---
src/bin/pg_dump/pg_dumpall.c | 5 ++---
src/bin/psql/startup.c | 5 ++---
src/bin/scripts/common.c | 5 ++---
7 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 86c2ead3772..0e59cc3afde 100644
--- 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
index 03ce502f922..4cc7b8b19ee 100644
--- 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
index d1450a0ebe2..515cc23576d 100644
--- 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
index 89fbabdfe6d..f1b755b33bc 100644
--- 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
index 799fee7616e..6d0add1eb60 100644
--- 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
index b5c8dcea5c8..ba4871f88e5 100644
--- 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
index 0318f99a2b1..2587f1a99df 100644
--- 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);
--
GitLab