In the CLI, add a new command-line option "--archive" (also "--ar") that

passes all subsequent arguments to the ".archive" command.

FossilOrigin-Name: a5c4d30af1271dea2d322b0679fe963bbd0d5db6bba8904caf5e30e510d01832

diff --git a/manifest b/manifest
index d4eea35cf9a7e0d74ad77ad28015aa788af01642..a9f0afdfd1271599fc4cad5cd0b6e27dadff8f41 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\ssqlite3_checker,\swrap\sthe\scall\sto\s"SELECT\scheckfreelist()"\sin\sa\ntransaction.
-D 2018-03-02T20:00:42.454
+C In\sthe\sCLI,\sadd\sa\snew\scommand-line\soption\s"--archive"\s(also\s"--ar")\sthat\npasses\sall\ssubsequent\sarguments\sto\sthe\s".archive"\scommand.
+D 2018-03-05T19:34:05.494
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737
@@ -489,7 +489,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c f02352ac5cbb6fad3804add825743b924cfb6c742ba2e8666d726828a9985d73
-F src/shell.c.in 47dac081e15544f4d4373a837215391459971b312c8bed15903e7e9045c3e652
+F src/shell.c.in 2115621cbc5a45ad5031f45c5473585963d061d8af184ffdf0c1ac86a4b9dd80
 F src/sqlite.h.in 235e942dd8c01b414c2996828b4d0d2500faf8850f8b24ae17d31c172f519e69
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
@@ -1708,7 +1708,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 044b0b65e716bffeddedbd1b0360c4c332f6d2359167c1d327a5ff96539474cb
-R 5617c0cb2b4786d2069667d5badd72e3
-U dan
-Z c724546c7342e99a479e8d8eca82215b
+P 02906e55d73ea3521ad1e6807cffed5c759147f7b2d89efc4add984e53e3ad49
+R 62ee6aafe33e5110a232a85ca1148daf
+U drh
+Z 2528010afb5b7373fd589a90e5b5beae

diff --git a/manifest.uuid b/manifest.uuid
index eb557b9a5be0fc74d4c52017cbd75c0f19d9ad40..7930d2e3b887b48901f04a83c96bf9b75e6f57a5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-02906e55d73ea3521ad1e6807cffed5c759147f7b2d89efc4add984e53e3ad49
\ No newline at end of file
+a5c4d30af1271dea2d322b0679fe963bbd0d5db6bba8904caf5e30e510d01832
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 121a6c3506ad9f669eafcd18ad9c8294a4e38554..2fff49dfcba209749ee43e49235d277ac10a0f7a 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7967,6 +7967,9 @@ static void process_sqliterc(
 ** Show available command line options
 */
 static const char zOptions[] =
+#if defined(SQLITE_HAVE_ZLIB) && !defined(SQLITE_OMIT_VIRTUALTABLE)
+  "   -archive ARGS...     pass ARGS to the \".archive\" command\n"
+#endif
   "   -ascii               set output mode to 'ascii'\n"
   "   -bail                stop after hitting an error\n"
   "   -batch               force batch I/O\n"
@@ -8263,6 +8266,12 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       data.openMode = SHELL_OPEN_APPENDVFS;
     }else if( strcmp(z,"-readonly")==0 ){
       data.openMode = SHELL_OPEN_READONLY;
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB)
+    }else if( strcmp(z, "-archive")==0 || strcmp(z, "-ar")==0 ){
+      /* All remaining command-line arguments are passed to the ".archive"
+      ** command, so ignore them */
+      break;
+#endif
     }
   }
   if( data.zDbFilename==0 ){
@@ -8408,6 +8417,17 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
           if( bail_on_error ) return rc;
         }
       }
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB)
+    }else if( strcmp(z, "-archive")==0 || strcmp(z, "-ar")==0 ){
+      if( nCmd>0 ){
+        utf8_printf(stderr, "Error: cannot mix regular SQL or dot-commands"
+                            " with \"%s\"\n", z);
+        return 1;
+      }
+      arDotCommand(&data, argv+i, argc-i);
+      readStdin = 0;
+      break;
+#endif
     }else{
       utf8_printf(stderr,"%s: Error: unknown option: %s\n", Argv0, z);
       raw_printf(stderr,"Use -help for a list of options.\n");