summaryrefslogtreecommitdiff
path: root/src/bin/psql/startup.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2000-11-27 02:20:36 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2000-11-27 02:20:36 +0000
commit9c5327b99be079f9052efaee210f7e517bc48219 (patch)
treec0cce051dccecfbeb1feb76e4567602c75d53424 /src/bin/psql/startup.c
parente8a72c0db22b75144dd2ec0410352dbf34d4bde6 (diff)
Pay attention to failure returns from fgets() in all cases.
Avoid infinite loop prompting for password at stdin EOF.
Diffstat (limited to 'src/bin/psql/startup.c')
-rw-r--r--src/bin/psql/startup.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 1a66d5fce36..e5513473710 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.40 2000/11/25 19:05:44 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.41 2000/11/27 02:20:36 tgl Exp $
*/
#include "postgres.h"
@@ -180,7 +180,8 @@ main(int argc, char *argv[])
username, password);
if (PQstatus(pset.db) == CONNECTION_BAD &&
- strcmp(PQerrorMessage(pset.db), "fe_sendauth: no password supplied\n") == 0)
+ strcmp(PQerrorMessage(pset.db), "fe_sendauth: no password supplied\n") == 0 &&
+ !feof(stdin))
{
PQfinish(pset.db);
need_pass = true;