From: drh <drh@noemail.net>
Date: Fri, 11 May 2018 19:11:18 +0000 (+0000)
Subject: In the CLI, return non-zero if there are errors on the command-line.
X-Git-Tag: version-3.24.0~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc29a86eee3c11a213abc3c3ecc07c57064c57a4;p=thirdparty%2Fsqlite.git

In the CLI, return non-zero if there are errors on the command-line.

FossilOrigin-Name: 13e7300a37e379eac564594d78d3f039fd25737493b3b627ef02fab57a6c98e1
---

diff --git a/manifest b/manifest
index 3958ff1fb1..8cf581c246 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sthe\shelp\smessage\sfrom\sthe\s".sha3sum"\scommand\sin\sthe\sCLI.
-D 2018-05-11T15:10:43.141
+C In\sthe\sCLI,\sreturn\snon-zero\sif\sthere\sare\serrors\son\sthe\scommand-line.
+D 2018-05-11T19:11:18.935
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -494,7 +494,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 6415381a0e9d22c0e7cba33ca4a53f81474190862f5d4838190f5eb5b0b47bc9
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c a35d462ee7a3c0856ad7a9d9c8921fbf3d91d911a8f39ad9d61302eb43b24a71
-F src/shell.c.in c625e81758225d64c5b0cb2b431579f7e4e8c63452fac74290c3e439c9fb7924
+F src/shell.c.in 4caa8c44f4ebd2c80f42de4b0cf7ffc69b7443521ab3a42adb114932d92111a0
 F src/sqlite.h.in ef7e6fae65cb40ba004abf090ea491751295c11e64b1446322813d3b473b9400
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9887b27e69c01e79c2cbe74ef73bf01af5b5703d6a7f0a4371e386d7249cb1c7
@@ -1728,8 +1728,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 20a8c61122f37a43c418ca4415b3d26e0f7a27a6faea9048aa9fbb1a56e9d629
-Q +e76f676c120cd503e4a7b7cc636250ace68f4eafbbe304a8fcf503614e1b9ad0
-R e71c0ede17299903a5b1f7980af3cd3c
+P dba87a201806f93a1736c1ee81d9c9cf9848e401a237dc2af3b4376402976c32
+R dde88735a12ce10911e75a8ac9c70225
 U drh
-Z 76fbb469bc3ba18d269103ca1eedc269
+Z e35f6e55abb2846b2727a31cf8bf8fdc
diff --git a/manifest.uuid b/manifest.uuid
index b45807e1d9..527272447c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dba87a201806f93a1736c1ee81d9c9cf9848e401a237dc2af3b4376402976c32
\ No newline at end of file
+13e7300a37e379eac564594d78d3f039fd25737493b3b627ef02fab57a6c98e1
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 845308111c..78fe0e1713 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7896,7 +7896,7 @@ static int line_is_complete(char *zSql, int nSql){
 }
 
 /*
-** Run a single line of SQL
+** Run a single line of SQL.  Return the number of errors.
 */
 static int runOneSqlLine(ShellState *p, char *zSql, FILE *in, int startline){
   int rc;
@@ -8017,7 +8017,7 @@ static int process_input(ShellState *p, FILE *in){
     }
   }
   if( nSql && !_all_whitespace(zSql) ){
-    runOneSqlLine(p, zSql, in, startline);
+    errCnt += runOneSqlLine(p, zSql, in, startline);
   }
   free(zSql);
   free(zLine);