From: drh Date: Tue, 5 Feb 2019 20:51:41 +0000 (+0000) Subject: Omit the ".progress" command from the shell if it is compiled with the X-Git-Tag: version-3.27.0~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=569b1d9119c0b05564236f1494c5c328e3fcc757;p=thirdparty%2Fsqlite.git Omit the ".progress" command from the shell if it is compiled with the SQLITE_OMIT_PROGRESS_CALLBACK option. FossilOrigin-Name: 4d0a949fd92e19fbf243a2e3a1a7c2cdb111f9a6943949d2420dd846bc7d9285 --- diff --git a/manifest b/manifest index ed78c3d53a..697cc15777 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sharmless\scompiler\swarning\sin\sthe\smemtrace.c\sextension. -D 2019-02-05T19:52:39.956 +C Omit\sthe\s".progress"\scommand\sfrom\sthe\sshell\sif\sit\sis\scompiled\swith\sthe\nSQLITE_OMIT_PROGRESS_CALLBACK\soption. +D 2019-02-05T20:51:41.317 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4 @@ -515,7 +515,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c c8f207247472c41ac73d738e1c1a80719ad253d1dbb617ed57740492b2a6c097 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 F src/select.c 8e22fda41a737c391e8b797f7c71e7ded1d107c31181b07bb10b3d4f22a28cd9 -F src/shell.c.in b5149a7d195b27672a1bc24620e12bfde0bde4436942c726f34889c7c0307271 +F src/shell.c.in f2c1adbee3f6f36686b4a38d2168ebfc25298b4ad1e6d95199fc4e95b539251d F src/sqlite.h.in 7da74fd5bd7a9dbe92297060f036935520b26e240457287c5e67c7b9db51a986 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683 @@ -1804,7 +1804,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 4978ee8b5405f958723b4ebbd4288bd08bff2b453da2d1c032d1ae904c2a3821 -R cdb2c90ee0a305aff630d3277982c1ce +P 2f468da4e9fb3edb5e902fa5d3c528726d1fb64d749d29e558ba3243c76bcb95 +R 5ea165a1c3df7a748d9da98e324064f0 U drh -Z b3f86d11f843cf24b9aff44a0fffb3a1 +Z 744816839bca5261e535a1342a752a93 diff --git a/manifest.uuid b/manifest.uuid index 747921527b..f88d26ad89 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2f468da4e9fb3edb5e902fa5d3c528726d1fb64d749d29e558ba3243c76bcb95 \ No newline at end of file +4d0a949fd92e19fbf243a2e3a1a7c2cdb111f9a6943949d2420dd846bc7d9285 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index 07292444f2..c7d94dbee8 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -1792,6 +1792,7 @@ static void eqp_render(ShellState *p){ } } +#ifndef SQLITE_OMIT_PROGRESS_CALLBACK /* ** Progress handler callback. */ @@ -1809,6 +1810,7 @@ static int progress_handler(void *pClientData) { } return 0; } +#endif /* SQLITE_OMIT_PROGRESS_CALLBACK */ /* ** This is the callback routine that the shell @@ -3496,11 +3498,13 @@ static const char *(azHelp[]) = { ".output ?FILE? Send output to FILE or stdout if FILE is omitted", " If FILE begins with '|' then open it as a pipe.", ".print STRING... Print literal STRING", +#ifndef SQLITE_OMIT_PROGRESS_CALLBACK ".progress N Invoke progress handler after every N opcodes", " --limit N Interrupt after N progress callbacks", " --once Do no more than one progress interrupt", " --quiet|-q No output except at interrupts", " --reset Reset the count for each input and interrupt", +#endif ".prompt MAIN CONTINUE Replace the standard prompts", ".quit Exit this program", ".read FILE Read input from FILE", @@ -7033,6 +7037,7 @@ static int do_meta_command(char *zLine, ShellState *p){ raw_printf(p->out, "\n"); }else +#ifndef SQLITE_OMIT_PROGRESS_CALLBACK if( c=='p' && n>=3 && strncmp(azArg[0], "progress", n)==0 ){ int i; int nn = 0; @@ -7076,6 +7081,7 @@ static int do_meta_command(char *zLine, ShellState *p){ open_db(p, 0); sqlite3_progress_handler(p->db, nn, progress_handler, p); }else +#endif /* SQLITE_OMIT_PROGRESS_CALLBACK */ if( c=='p' && strncmp(azArg[0], "prompt", n)==0 ){ if( nArg >= 2) {