From: mistachkin <mistachkin@noemail.net>
Date: Mon, 19 Jan 2015 20:22:33 +0000 (+0000)
Subject: Remove a shell function that is now superfluous.
X-Git-Tag: version-3.8.10~11^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdffff9d180bc0dc0298f4dafe76e2fb06e3ed15;p=thirdparty%2Fsqlite.git

Remove a shell function that is now superfluous.

FossilOrigin-Name: d8564f70e6ba1e7c485d6b9a6a6cd81c43b41c98
---

diff --git a/manifest b/manifest
index 7e4412cd74..c2375d740a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\supdates\sfrom\strunk.
-D 2015-01-19T20:19:22.634
+C Remove\sa\sshell\sfunction\sthat\sis\snow\ssuperfluous.
+D 2015-01-19T20:22:33.935
 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 1a542717464cc8a4387d8d0e5bac4533ede7420c
+F src/shell.c f5e99e5411313da3f17d63be3393f567dcfd8f66
 F src/sqlite.h.in 9dfc99d6533d36d6a549c4f3f01cacc8be956ada
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
@@ -1236,7 +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 c7167f88ec261eb0dbcea29817c7677e1f539d4a 2037442c582e51d85967bc911ea4a412eb4da573
-R f1484b10391f5c5603ce4fabac594ce3
+P d9f4035b381dcf8d3c96c42017ce28ef66201933
+R 4d1b1f8bcff8ce493a9009a139a1f217
 U mistachkin
-Z a25ec5a48e2107a23cbe19afa260ac04
+Z 498ff66fe60eb7a6487f38007cbf007b
diff --git a/manifest.uuid b/manifest.uuid
index 4e7cfa5d9b..1037d6e32a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d9f4035b381dcf8d3c96c42017ce28ef66201933
\ No newline at end of file
+d8564f70e6ba1e7c485d6b9a6a6cd81c43b41c98
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index 7fc0ef104c..b7fa627bfb 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -768,22 +768,6 @@ static void interrupt_handler(int NotUsed){
 }
 #endif
 
-#if defined(WIN32) || defined(_WIN32)
-/*
-** This routine is used to adjust the file translation mode for the output
-** file.  It is only used on Windows.
-*/
-static void enable_binary_output(
-  ShellState *p,
-  int enable
-){
-  fflush(p->out);
-  _setmode(_fileno(p->out), enable ? _O_BINARY : _O_TEXT);
-}
-#else
-#define enable_binary_output(p,e)
-#endif
-
 /*
 ** This is the callback routine that the shell
 ** invokes for each row of a query result.
@@ -2570,7 +2554,11 @@ static int do_meta_command(char *zLine, ShellState *p){
 
   if( c=='b' && n>=3 && strncmp(azArg[0], "binary", n)==0 ){
     if( nArg==2 ){
-      enable_binary_output(p, booleanValue(azArg[1]));
+      if( booleanValue(azArg[1]) ){
+        setBinaryMode(p->out);
+      }else{
+        setTextMode(p->out);
+      }
     }else{
       fprintf(stderr, "Usage: .binary on|off\n");
       rc = 1;