From: larrybr Date: Sat, 11 Mar 2023 00:15:41 +0000 (+0000) Subject: CLI help to reflect no-more-options option X-Git-Tag: version-3.42.0~262 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20f2917881685e92ff53a66d1727d887b27f6f91;p=thirdparty%2Fsqlite.git CLI help to reflect no-more-options option FossilOrigin-Name: 30d95a12eb8b1cfc8ed11d3ed68cd713993ba34efa2fe623c18cfe41f14df1d9 --- diff --git a/manifest b/manifest index 30cc60c9cf..7476f15705 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\stypo\sin\sa\scomment.\s\sNo\scode\schanges. -D 2023-03-10T21:27:59.458 +C CLI\shelp\sto\sreflect\sno-more-options\soption +D 2023-03-11T00:15:41.078 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -626,7 +626,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 4233c3030341bf1a21cea90890e6b3d3531721acc62ede147e899d36ffad8238 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c d4dd7843ce2fe0b886c3970b34a12330369fbfc7c86a5fece5a8ae02ae157038 -F src/shell.c.in c289de5d93ea2531bc8158e64ea8b6278ab87f953d185a811f4a7ae3ea310d84 +F src/shell.c.in 7ade4506b907025a0d19e31f85d1200bfbd1eed48e94cea013b669d3efe5073c F src/sqlite.h.in f01033703156615566bb329144d736a37fc35a278049db91127782a9c799b938 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4 @@ -2050,8 +2050,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 0822788752621f6bf6af44b420b594ddd352634b3b0ed0eb835abea34b45817a -R db9363d6a19c6dbc5cb6cb577fb0dab9 -U drh -Z fc73c7e44cdd2d405b203191c21c667e +P 76acc075402aac2d14d8279b8095008a842522a0985fdf89200da4339757a40b +R ff346326dc1d1e08fe0a4af372c66c16 +U larrybr +Z 0fb7cbabf6bd8e54781f43c8092f8b04 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index aaf566c2e4..89bdf2aef6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -76acc075402aac2d14d8279b8095008a842522a0985fdf89200da4339757a40b \ No newline at end of file +30d95a12eb8b1cfc8ed11d3ed68cd713993ba34efa2fe623c18cfe41f14df1d9 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index 0709f7d004..33bf0fad83 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -11668,6 +11668,7 @@ static void process_sqliterc( */ static const char zOptions[] = #if defined(SQLITE_HAVE_ZLIB) && !defined(SQLITE_OMIT_VIRTUALTABLE) + " -- treat none of arguments following as options\n" " -A ARGS... run \".archive ARGS\" and exit\n" #endif " -append append the database to the end of the file\n" @@ -11729,9 +11730,9 @@ static const char zOptions[] = ; static void usage(int showDetail){ utf8_printf(stderr, - "Usage: %s [OPTIONS] FILENAME [SQL]\n" + "Usage: %s [OPTIONS] [FILENAME] [SQL]\n" "FILENAME is the name of an SQLite database. A new database is created\n" - "if the file does not previously exist.\n", Argv0); + "if the file does not previously exist. Defaults to :memory:.\n", Argv0); if( showDetail ){ utf8_printf(stderr, "OPTIONS include:\n%s", zOptions); }else{