Surely this temp buffer needn't be static.

tglsfdc · tglsfdc · commit 6d0efd3a092e · 2006-09-22T19:51:14.000Z
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
@@ -7,7 +7,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/common.c,v 1.21 2006/09/22 18:50:41 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.22 2006/09/22 19:51:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -206,21 +206,23 @@ executeCommand(PGconn *conn, const char *query,
 bool
 yesno_prompt(const char *question)
 {
-	static char prompt[128];
+	char prompt[256];
 
 	for (;;)
 	{
 		char *resp;
 
 		/* translator: This is a question followed by the translated options for "yes" and "no". */
-		snprintf(prompt, sizeof(prompt), _("%s (%s/%s) "), _(question), _(PG_YESLETTER), _(PG_NOLETTER));
+		snprintf(prompt, sizeof(prompt), _("%s (%s/%s) "),
+				 _(question), _(PG_YESLETTER), _(PG_NOLETTER));
 		resp = simple_prompt(prompt, 1, true);
 
 		if (strcmp(resp, _(PG_YESLETTER)) == 0)
 			return true;
 		else if (strcmp(resp, _(PG_NOLETTER)) == 0)
 			return false;
 
-		printf(_("Please answer \"%s\" or \"%s\".\n"), _(PG_YESLETTER), _(PG_NOLETTER));
+		printf(_("Please answer \"%s\" or \"%s\".\n"),
+			   _(PG_YESLETTER), _(PG_NOLETTER));
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.21 2006/09/22 18:50:41 petere Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.22 2006/09/22 19:51:14 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -206,21 +206,23 @@ executeCommand(PGconn conn, const char query,`
`206`	`206`	`bool`
`207`	`207`	`yesno_prompt(const char *question)`
`208`	`208`	`{`
`209`		`- static char prompt[128];`
	`209`	`+ char prompt[256];`
`210`	`210`
`211`	`211`	`for (;;)`
`212`	`212`	`{`
`213`	`213`	`char *resp;`
`214`	`214`
`215`	`215`	`/* translator: This is a question followed by the translated options for "yes" and "no". */`
`216`		`- snprintf(prompt, sizeof(prompt), _("%s (%s/%s) "), _(question), _(PG_YESLETTER), _(PG_NOLETTER));`
	`216`	`+ snprintf(prompt, sizeof(prompt), _("%s (%s/%s) "),`
	`217`	`+ _(question), _(PG_YESLETTER), _(PG_NOLETTER));`
`217`	`218`	`resp = simple_prompt(prompt, 1, true);`
`218`	`219`
`219`	`220`	`if (strcmp(resp, _(PG_YESLETTER)) == 0)`
`220`	`221`	`return true;`
`221`	`222`	`else if (strcmp(resp, _(PG_NOLETTER)) == 0)`
`222`	`223`	`return false;`
`223`	`224`
`224`		`- printf(_("Please answer \"%s\" or \"%s\".\n"), _(PG_YESLETTER), _(PG_NOLETTER));`
	`225`	`+ printf(_("Please answer \"%s\" or \"%s\".\n"),`
	`226`	`+ _(PG_YESLETTER), _(PG_NOLETTER));`
`225`	`227`	`}`
`226`	`228`	`}`