From cbb7acface7115dfb17674a68086bc82a3b8fa11 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut
Date: Fri, 22 Sep 2006 18:50:41 +0000
Subject: Rearrange yes/no prompting code so that the prompts always show the
 (possibly (un)translated) letters that are actually expected as input. Also
 reject invalid responses instead of silenty taken them as "no".

with help from Bernd Helmle
---
 src/bin/scripts/dropuser.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/bin/scripts/dropuser.c')

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 5d083caef53..1d22368b19e 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.18 2006/05/29 19:52:46 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.19 2006/09/22 18:50:41 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -105,11 +105,8 @@ main(int argc, char *argv[])
 
 	if (interactive)
 	{
-		char	   *reply;
-
 		printf(_("Role \"%s\" will be permanently removed.\n"), dropuser);
-		reply = simple_prompt("Are you sure? (y/n) ", 1, true);
-		if (check_yesno_response(reply) != 1)
+		if (!yesno_prompt("Are you sure?"))
 			exit(0);
 	}
 
-- 
cgit v1.2.3