Improve psql \df error handling.

bmomjian · bmomjian · commit 0669785ba8ab · 2009-04-21T17:28:01.000Z
David Fetter
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.209 2009/04/21 15:49:06 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.210 2009/04/21 17:28:01 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -206,9 +206,15 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
 	PGresult   *res;
 	printQueryOpt myopt = pset.popt;
 
+	if (strlen(functypes) != strspn(functypes, "antwS+"))
+	{
+		fprintf(stderr, _("\\df only takes [antwS+] as options\n"));
+		return true;
+	}
+
 	if (showWindow && pset.sversion < 80400)
 	{
-		fprintf(stderr, _("\\df does not take a \"w\" decorator in %d.%d.\n"),
+		fprintf(stderr, _("\\df does not take a \"w\" option in %d.%d.\n"),
 				pset.sversion / 10000, (pset.sversion / 100) % 100);
 		return true;
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.209 2009/04/21 15:49:06 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.210 2009/04/21 17:28:01 momjian Exp $`
`12`	`12`	`*/`
`13`	`13`	`#include "postgres_fe.h"`
`14`	`14`
`@@ -206,9 +206,15 @@ describeFunctions(const char functypes, const char pattern, bool verbose, bool`
`206`	`206`	`PGresult *res;`
`207`	`207`	`printQueryOpt myopt = pset.popt;`
`208`	`208`
	`209`	`+ if (strlen(functypes) != strspn(functypes, "antwS+"))`
	`210`	`+ {`
	`211`	`+ fprintf(stderr, _("\\df only takes [antwS+] as options\n"));`
	`212`	`+ return true;`
	`213`	`+ }`
	`214`	`+`
`209`	`215`	`if (showWindow && pset.sversion < 80400)`
`210`	`216`	`{`
`211`		`- fprintf(stderr, _("\\df does not take a \"w\" decorator in %d.%d.\n"),`
	`217`	`+ fprintf(stderr, _("\\df does not take a \"w\" option in %d.%d.\n"),`
`212`	`218`	`pset.sversion / 10000, (pset.sversion / 100) % 100);`
`213`	`219`	`return true;`
`214`	`220`	`}`