Fix the ".open --hexdb" command in the CLI so that it works even with

terminal input.

FossilOrigin-Name: 9b5d943426c9273162ecb4c561eb3b25e843318dd438239c882c9db50f788454

diff --git a/manifest b/manifest
index 381e1576603fc4f9725f8c4f5ba9cae60e1678fa..7214de0286a5ae7250bd12ac991e1dbc0a2574e7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\stypeof()\sfunction\salways\sreturns\sSQLITE_FLOAT\sfor\sfloating\npoint\svalues\seven\swhen\sthe\svalue\sis\sstored\sas\san\sinteger\sto\ssave\sspace.
-D 2019-05-02T17:45:52.902
+C Fix\sthe\s".open\s--hexdb"\scommand\sin\sthe\sCLI\sso\sthat\sit\sworks\seven\swith\nterminal\sinput.
+D 2019-05-03T02:41:36.666
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -520,7 +520,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 408632d9531ca8f1df8591f00530797daaa7bde3fe0d3211de4d431cbb99347e
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c b7304d2f491c11a03a7fbdf34bc218282ac54052377809d4dc3b4b1e7f4bfc93
-F src/shell.c.in 567236da9ee68b1dfa363426858ee5e310976ffe422a7b7ae220c0315d7e8c53
+F src/shell.c.in 5470f08809ca5d9ac79f782f8f16d96a4299e584dbc456d8ef4aa6ca0824b5b3
 F src/sqlite.h.in 38390767acc1914d58930e03149595ee4710afa4e3c43ab6c3a8aea3f1a6b8cd
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
@@ -1822,7 +1822,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 005a169406ccea6e3cc42271620870d985e8bada1ad49a63656003db4911cb51
-R 1a712fa3e334798d542297677e583b67
+P 48889530a9de22fee536edfd1627be62396ed18d842d5fd6d91e010b4337be95
+R 6c4a08d775f402ededf164c110b85e69
 U drh
-Z 11e98b9b34589d0e8654b135f89f5a58
+Z 460ffd8bf743873ca175586bdb28c5f1

diff --git a/manifest.uuid b/manifest.uuid
index 6808f0b46a1b915465b7ed660d54836c67bfe4a7..8b98d46674c110363cd34dec11635a7e2a0a721a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48889530a9de22fee536edfd1627be62396ed18d842d5fd6d91e010b4337be95
\ No newline at end of file
+9b5d943426c9273162ecb4c561eb3b25e843318dd438239c882c9db50f788454
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index e145a1547cfdd5cab6435fce99d8a89cf3723794..fa8554ad769fe1fb419307d20530c09eb7e8adcb 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3877,6 +3877,7 @@ static unsigned char *readHexDb(ShellState *p, int *pnData){
   }else{
     in = p->in;
     nLine = p->lineno;
+    if( in==0 ) in = stdin;
   }
   *pnData = 0;
   nLine++;