From: drh <drh@noemail.net>
Date: Wed, 17 Apr 2013 17:33:17 +0000 (+0000)
Subject: In the command-line shell, allow a dot-command to occur after a
X-Git-Tag: version-3.7.17~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a411f441bd10739266df96fb029b0c1068e2278;p=thirdparty%2Fsqlite.git

In the command-line shell, allow a dot-command to occur after a
multi-line c-style comment.

FossilOrigin-Name: e2c94ab930f0e5a6dbe8cdd34ebb8cfeeedca56c
---

diff --git a/manifest b/manifest
index 7d65c5f899..3e8e1903cb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\ssome\sof\sthe\scomments\sthat\sare\sused\sto\srender\sdocumentation\nconcerning\sloadable\sextensions.\s\sNo\schanges\sto\scode.
-D 2013-04-17T14:04:52.335
+C In\sthe\scommand-line\sshell,\sallow\sa\sdot-command\sto\soccur\safter\sa\nmulti-line\sc-style\scomment.
+D 2013-04-17T17:33:17.457
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3dd3fcb87b70c78d99b2c8a03e44ec86d6ca9ce2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -181,7 +181,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 10a1b332e3eb36e5d561085e18c58a8578cd7d73
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c 01540bcd3df3c8f1187158e77986028b1c667258
-F src/shell.c a303eb4529ee78a68ee54e8ba6941f76ee5601d2
+F src/shell.c aca9d94653decd4496846dee0c7ba83eaf96a46d
 F src/sqlite.h.in 31442751f3a63a538777188b6dfe70aebed338ac
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75
@@ -1051,7 +1051,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 467e218120d63d0f34c447f7324bac1364ac0eac
-R 8ddf4f94c02f24d9b9c0c2b780ed2098
+P 76f4e31245fd1676a4520a2f7488bca6eb981e4a
+R 7329574a8fd763912288e6955296b961
 U drh
-Z d6edc377ec44c72133adc32403868eee
+Z d7a8232879b542fa4edbd90644b25d07
diff --git a/manifest.uuid b/manifest.uuid
index b12409c708..2d365214d6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-76f4e31245fd1676a4520a2f7488bca6eb981e4a
\ No newline at end of file
+e2c94ab930f0e5a6dbe8cdd34ebb8cfeeedca56c
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index 1bb1b377b3..13a2f70cbc 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -2784,6 +2784,10 @@ static int process_input(struct callback_data *p, FILE *in){
       free(zSql);
       zSql = 0;
       nSql = 0;
+    }else if( zSql && _all_whitespace(zSql) ){
+      free(zSql);
+      zSql = 0;
+      nSql = 0;
     }
   }
   if( zSql ){