From: drh <drh@noemail.net>
Date: Sat, 6 Oct 2018 14:38:17 +0000 (+0000)
Subject: Fix the ".help -all" option in the command-line shell.
X-Git-Tag: version-3.26.0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=488cddfa86eab11dd5f63d40f2521af60070c29a;p=thirdparty%2Fsqlite.git

Fix the ".help -all" option in the command-line shell.

FossilOrigin-Name: aac8f1dff0728c629b5cbf30369ee91c5862a707ede694dc2628d1d4f5a6c202
---

diff --git a/manifest b/manifest
index 6f481a7388..5f20adeb35 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scases\sand\sassert()\sstatements\sto\sensure\sthat\sthe\sauthorizer\sis\sbeing\ncalled\sas\sexpected\sfrom\swithin\sALTER\sTABLE.
-D 2018-10-06T13:46:22.771
+C Fix\sthe\s".help\s-all"\soption\sin\sthe\scommand-line\sshell.
+D 2018-10-06T14:38:17.499
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -504,7 +504,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bc8c79e56439b111e7d9415e44940951f7087e9466c3a9d664558ef0faf31073
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 33aacf1c17c64a00788c779b23d0875dd0d90eb4c08f867ebc31139ef3a67c95
-F src/shell.c.in 6046da2a92998b8fe004ed4eadd4d7f53d6a8e4d99e5e25a0cc7de6de5f6b26b
+F src/shell.c.in 09342e09c9518e2d927566069272a7a47799e3ad4125562bbfc1240478c4a5a2
 F src/sqlite.h.in 4b4c2f2daeeed4412ba9d81bc78092c69831fe6eda4f0ae5bf951da51a8dccec
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 305adca1b5da4a33ce2db5bd236935768e951d5651bfe5560ed55cfcdbce6a63
@@ -1771,7 +1771,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 11d9015f31d1ea2fd27174d4ceea08a145fdbb92a175bec0aae4b90f991694bc
-R c3f9b3556958d5e7141476120f8d2533
-U dan
-Z 76c0dfa6b1cfccd65370e7083a5b3873
+P ff10d2c7de430c88167b1e6e4f5307eee5d69e22c8d24b2ef4fcb3aea25a92e1
+R 29cbf681583baf68c349077deec43fe7
+U drh
+Z 64cd6344daa5db6811005ab9259da4cc
diff --git a/manifest.uuid b/manifest.uuid
index 90f8df9d79..d13538dc28 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ff10d2c7de430c88167b1e6e4f5307eee5d69e22c8d24b2ef4fcb3aea25a92e1
\ No newline at end of file
+aac8f1dff0728c629b5cbf30369ee91c5862a707ede694dc2628d1d4f5a6c202
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index cc375e820c..fe242af133 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3509,10 +3509,15 @@ static int showHelp(FILE *out, const char *zPattern){
   int i, j;
   int n = 0;
   char *zPat;
-  if( zPattern==0 || zPattern[0]=='0' ){
+  if( zPattern==0
+   || zPattern[0]=='0'
+   || strcmp(zPattern,"-a")==0
+   || strcmp(zPattern,"-all")==0
+  ){
     /* Show all commands, but only one line per command */
+    if( zPattern==0 ) zPattern = "";
     for(i=0; i<ArraySize(azHelp); i++){
-      if( azHelp[i][0]=='.' ){
+      if( azHelp[i][0]=='.' || zPattern[0] ){
         utf8_printf(out, "%s\n", azHelp[i]);
         n++;
       }