summaryrefslogtreecommitdiff
path: root/src/bin/psql/command.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2007-12-11 19:01:06 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2007-12-11 19:01:06 +0000
commit1161f1ae1474e373ac02fd24898f12d9c7c43436 (patch)
tree420586829fa56f11de542b66b6ea625773c2dbe9 /src/bin/psql/command.c
parent3a7211aaf782ce56082720b741440e345cb711c6 (diff)
Remove the long-deprecated -u option from psql, since it does nothing very
useful and confuses people who think it is the same as -U. (Eventually we might want to re-introduce it as being an alias for -U, but that should not happen until the switch has actually not been there for a few releases.) Likewise in pg_dump and pg_restore. Per gripe from Robert Treat and subsequent discussion.
Diffstat (limited to 'src/bin/psql/command.c')
-rw-r--r--src/bin/psql/command.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 19d9d5141e7..0c496ec86ec 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2007, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.184 2007/12/09 19:01:40 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.185 2007/12/11 19:01:06 tgl Exp $
*/
#include "postgres_fe.h"
#include "command.h"
@@ -1081,8 +1081,9 @@ prompt_for_password(const char *username)
{
char *prompt_text;
- prompt_text = malloc(strlen(username) + 32);
- sprintf(prompt_text, "Password for user \"%s\": ", username);
+ prompt_text = malloc(strlen(username) + 100);
+ snprintf(prompt_text, strlen(username) + 100,
+ _("Password for user %s: "), username);
result = simple_prompt(prompt_text, 100, false);
free(prompt_text);
}