From: drh Date: Sun, 18 Jan 2015 01:50:54 +0000 (+0000) Subject: Set the command-line shell stdin to binary mode on windows. X-Git-Tag: version-3.8.9~167 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d907be5c9c2eb195f747a3112edf5aab4e42c98;p=thirdparty%2Fsqlite.git Set the command-line shell stdin to binary mode on windows. FossilOrigin-Name: 80541e8b94b713e8f9e588ae047ffc5ae804ef1c --- diff --git a/manifest b/manifest index ba96eedc79..d122701d5e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sharmless\scompiler\swarning\sthe\sVFS\sfor\sWindows. -D 2015-01-17T15:26:28.724 +C Set\sthe\scommand-line\sshell\sstdin\sto\sbinary\smode\son\swindows. +D 2015-01-18T01:50:54.333 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -230,7 +230,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/select.c e4c38c75e36f28aed80a69a725d888751bfd53df -F src/shell.c 5b8e786a7c8eec87fa3f2ea615b337d2d99e284c +F src/shell.c 96c40c85467552025d81505310efcf3679303d3a F src/sqlite.h.in 9dfc99d6533d36d6a549c4f3f01cacc8be956ada F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d @@ -1236,8 +1236,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 7d68a42face3ab14ed88407d4331872f5b243fdf cab46fb737ed3fc29dc8517f07bcfc72936df2b8 -R 09c0fda2a74fde3bf50886f176d10583 -T +closed cab46fb737ed3fc29dc8517f07bcfc72936df2b8 +P ceac571f53bdbc02616b21a4404cb1250030dea8 +R af1132932e63d89318ed108ce444bb3a U drh -Z 7ac57dd8af4bfddd779870b304f0eb12 +Z 8c65f5a7bb0fabe2bc52b8a9296117bf diff --git a/manifest.uuid b/manifest.uuid index 55cebb6800..2997f19ca0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ceac571f53bdbc02616b21a4404cb1250030dea8 \ No newline at end of file +80541e8b94b713e8f9e588ae047ffc5ae804ef1c \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index 9c0481c0dd..9e23734ae7 100644 --- a/src/shell.c +++ b/src/shell.c @@ -4175,6 +4175,9 @@ int main(int argc, char **argv){ sqlite3_sourceid(), SQLITE_SOURCE_ID); exit(1); } +#endif +#if defined(WIN32) || defined(_WIN32) + _setmode(0, _O_BINARY); #endif Argv0 = argv[0]; main_init(&data);