Only quote the arguments to the ".shell" and ".system" commands if they

contain spaces.

FossilOrigin-Name: e58f4bd39d51c4c1a28684dab6427de81173d564

diff --git a/manifest b/manifest
index 593d435c92e27765ccae4f4ed2832614e7a5d0f8..0d3e2478c41aa235254b262e45044b80cd4968ca 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s".shell"\sand\sthe\s".system"\scommands\s(aliases\sfor\sthe\ssame\sthing)\nto\sthe\scommand-line\sshell.
-D 2014-05-28T20:22:28.746
+C Only\squote\sthe\sarguments\sto\sthe\s".shell"\sand\s".system"\scommands\sif\sthey\ncontain\sspaces.
+D 2014-05-29T03:17:29.412
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -221,7 +221,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
 F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 F src/select.c 7df17ec5506c2427576d412bee0e6ea740e12563
-F src/shell.c 8a0f8f4cd354a1b9f8181d747943c86c678dccfc
+F src/shell.c f389c2bcae6192daad01b46169e63538456427fa
 F src/sqlite.h.in 564fc23db33870b5096b20d72df7491ce0b8b74f
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1173,7 +1173,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c461c0fe051d33cc8b4fede4eca13cd71f28126a
-R fb95d3a0c98ad15d709d47a9c08467f3
+P d018a34a05cec6adda61ed225d084c587343f2a6
+R c32df26ea35dc6668db5bcd28814662e
 U drh
-Z 7af2c566de91be5522e4d89625d0c4dc
+Z a04310abc4a1ec4cc8144d03b2ee32a5

diff --git a/manifest.uuid b/manifest.uuid
index e9e567d4578232549f9fcf9250711dee880f4974..944a28888f956ff59ea9822488eeeaee8c863b4a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d018a34a05cec6adda61ed225d084c587343f2a6
\ No newline at end of file
+e58f4bd39d51c4c1a28684dab6427de81173d564
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index ddda4fd63fc4e918426017d6cdeac7c343d04f08..f51ce9a1647750ab8555c623d1f8d7c918ae9c3e 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -2909,9 +2909,10 @@ static int do_meta_command(char *zLine, struct callback_data *p){
   ){
     char *zCmd;
     int i;
-    zCmd = sqlite3_mprintf("\"%s\"", azArg[1]);
+    zCmd = sqlite3_mprintf(strchr(azArg[1],' ')==0?"%s":"\"%s\"", azArg[1]);
     for(i=2; i<nArg; i++){
-      zCmd = sqlite3_mprintf("%z \"%s\"", zCmd, azArg[i]);
+      zCmd = sqlite3_mprintf(strchr(azArg[i],' ')==0?"%z %s":"%z \"%s\"",
+                             zCmd, azArg[i]);
     }
     system(zCmd);
     sqlite3_free(zCmd);