Fix bogus prompt for password in -u case. Per gripe from Robert Treat.

tglsfdc · tglsfdc · commit e8191d9f2348 · 2007-12-09T19:04:47.000Z
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.142 2007/12/09 19:01:40 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.143 2007/12/09 19:04:47 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -194,8 +194,8 @@ main(int argc, char *argv[])
 	else
 	{
 		password_prompt = malloc(strlen(_("Password for user %s: ")) - 2 +
-								 strlen(options.username) + 1);
-		sprintf(password_prompt, _("Password for user %s: "), options.username);
+								 strlen(username) + 1);
+		sprintf(password_prompt, _("Password for user %s: "), username);
 	}
 
 	if (pset.getPassword)

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2007, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.142 2007/12/09 19:01:40 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.143 2007/12/09 19:04:47 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -194,8 +194,8 @@ main(int argc, char *argv[])`
`194`	`194`	`else`
`195`	`195`	`{`
`196`	`196`	`password_prompt = malloc(strlen(_("Password for user %s: ")) - 2 +`
`197`		`- strlen(options.username) + 1);`
`198`		`- sprintf(password_prompt, _("Password for user %s: "), options.username);`
	`197`	`+ strlen(username) + 1);`
	`198`	`+ sprintf(password_prompt, _("Password for user %s: "), username);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`if (pset.getPassword)`