CLI .ar made to enforce getting a proper subcommand.

FossilOrigin-Name: 104ab105ac0e96c0fc61c6d69179bf984fcfe5e0efb2c82f3742456c1b5fe5d1

diff --git a/manifest b/manifest
index dc6c9a535d94a7fa5ca4d36beb8cb3b8941af261..7cfd887db49d5b3f5202655fdeb4f98132cc996e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sfunction\sdeclaration\sso\sthat\sit\scorrectly\sappears\sas\sprivate\sin\nthe\samalgamation.\s\s[forum:/forumpost/ec8c77516c|Forum\spost\sec8c77516c].
-D 2023-04-20T10:40:37.868
+C CLI\s.ar\smade\sto\senforce\sgetting\sa\sproper\ssubcommand.
+D 2023-04-20T16:15:20.263
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -633,7 +633,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c f879cef11c462a2c37a8c906932781e384c3bb32042c355a704a043029c90d27
-F src/shell.c.in 9d5da77007123401da702e8587558edddd520c925f8f561aa7b8d9387e71e096
+F src/shell.c.in cea07e8be63c9dd6074ace3840c6d2e10bf3d41e52b0dc784cda6d0cc1c418a9
 F src/sqlite.h.in 4fff9c6cc5d4cbba9532a668112efb6dc469c425e1a2196664d7c07d508363ef
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2059,8 +2059,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8a1ad137606ce5bddbed62f89ff9a5cd922c6530db84c12b8b27c08df3c66bc6
-R 5650bdd0fe3fa605ffb40959b74f4f18
-U drh
-Z 9167a0af56191794ab500594595d0dd0
+P 1864569bb9fe28a5e77f34b199f26ac272dbbb1a6642dacd7e50ddd29aa567b6
+R fb998b3563ae8890a9efea4cceb34c23
+U larrybr
+Z 658a3fb9fe729e826e83c171d4af40ae
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ffb8cf29a5b9fc46d79ca2232be7e1477f034fe5..9a2110089f117a227c75add4c6286e8656a4d51c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1864569bb9fe28a5e77f34b199f26ac272dbbb1a6642dacd7e50ddd29aa567b6
\ No newline at end of file
+104ab105ac0e96c0fc61c6d69179bf984fcfe5e0efb2c82f3742456c1b5fe5d1
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 8ce845ba4d13c1ccf956131a7a6f5b36eb776f21..4d4b172c276bf27aef843b1d64a70c9fd96888f3 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7058,7 +7058,10 @@ static int arParseCommand(
       }
     }
   }
-
+  if( pAr->eCmd==0 ){
+    utf8_printf(stderr, "Required argument missing.  Usage:\n");
+    return arUsage(stderr);
+  }
   return SQLITE_OK;
 }