Modify the CLI so that it will ignore whitespace at the end of lines.

Ticket #2631 (CVS 4412)

FossilOrigin-Name: f780a17f4b0e679479c2b368d8659a0ee61c343d

diff --git a/manifest b/manifest
index 3f1748249edee092aba45bb640efffbcbb517ed6..163b8b2e506377771438c51a8c5badb40c28de84 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Throw\san\serror\son\san\sattempt\sto\sopen\sa\sdatabase\swhere\sthe\spage\nsize\sis\slarger\sthan\sSQLITE_MAX_PAGE_SIZE.\s\sTicket\s#2628.\s(CVS\s4411)
-D 2007-09-06T23:39:37
+C Modify\sthe\sCLI\sso\sthat\sit\swill\signore\swhitespace\sat\sthe\send\sof\slines.\nTicket\s#2631\s(CVS\s4412)
+D 2007-09-07T01:12:32
 F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -129,7 +129,7 @@ F src/printf.c 85f7a4344dda6782a76df43da8e4d5b0342d6b85
 F src/random.c 4a22746501bf36b0a088c66e38dde5daba6a35da
 F src/select.c 4706a6115da1bdc09a2be5991168a6cc2c0df267
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
-F src/shell.c ac29402b538515fa4697282387be9c1205e6e9eb
+F src/shell.c 82089379833e361ba8a2ae65316a2173785300c0
 F src/sqlite.h.in 775be6f8a5305ef2c92506bc23181550171aaae2
 F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb
 F src/sqliteInt.h bb126b074352ef0ee20399883172161baf5eead2
@@ -570,7 +570,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 44d8d1e92d93a5bb28bd10281b4d87e89586ef58
-R f03766f65192dfb6547d9735765cf66c
+P 4881f7cb37e35dcf5da358464ac858a508128e47
+R ce40876ae34e300aa8df8df02cc80ba8
 U drh
-Z 23993a6f77c3daa2e5e01c8013cf24fc
+Z 704732809c269e991b0391352c5618d9

diff --git a/manifest.uuid b/manifest.uuid
index 155fcc6ff2ce41ee03a9f8a76de4db3d5f4c6987..21d939cef50bdcb018837b6c0061332c6fad0586 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4881f7cb37e35dcf5da358464ac858a508128e47
\ No newline at end of file
+f780a17f4b0e679479c2b368d8659a0ee61c343d
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 6f5c5cb378d800f42247b46f057fe49ef0bf520f..bd5105e48c1fb1c8c64e168a139528345b29ec32 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.166 2007/07/30 20:41:53 drh Exp $
+** $Id: shell.c,v 1.167 2007/09/07 01:12:32 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -1537,12 +1537,13 @@ static int do_meta_command(char *zLine, struct callback_data *p){
 }
 
 /*
-** Return TRUE if the last non-whitespace character in z[] is a semicolon.
-** z[] is N characters long.
+** Return TRUE if a semicolon occurs anywhere in the first N characters
+** of string z[].
 */
-static int _ends_with_semicolon(const char *z, int N){
-  while( N>0 && isspace((unsigned char)z[N-1]) ){ N--; }
-  return N>0 && z[N-1]==';';
+static int _contains_semicolon(const char *z, int N){
+  int i;
+  for(i=0; i<N; i++){  if( z[i]==';' ) return 1; }
+  return 0;
 }
 
 /*
@@ -1597,6 +1598,7 @@ static int process_input(struct callback_data *p, FILE *in){
   char *zLine = 0;
   char *zSql = 0;
   int nSql = 0;
+  int nSqlPrior = 0;
   char *zErrMsg;
   int rc;
   int errCnt = 0;
@@ -1629,6 +1631,7 @@ static int process_input(struct callback_data *p, FILE *in){
     if( _is_command_terminator(zLine) ){
       memcpy(zLine,";",2);
     }
+    nSqlPrior = nSql;
     if( zSql==0 ){
       int i;
       for(i=0; zLine[i] && isspace((unsigned char)zLine[i]); i++){}
@@ -1653,7 +1656,8 @@ static int process_input(struct callback_data *p, FILE *in){
       memcpy(&zSql[nSql], zLine, len+1);
       nSql += len;
     }
-    if( zSql && _ends_with_semicolon(zSql, nSql) && sqlite3_complete(zSql) ){
+    if( zSql && _contains_semicolon(&zSql[nSqlPrior], nSql-nSqlPrior)
+                && sqlite3_complete(zSql) ){
       p->cnt = 0;
       open_db(p);
       rc = sqlite3_exec(p->db, zSql, callback, p, &zErrMsg);