Add "b" to fopen() in the hexio tests so that extra carriage returns are

not inserted on win32 and OS/2.  Test harness change only - no changes
to the core SQLite code. (CVS 5124)

FossilOrigin-Name: 68cbc6b45c98ebaeca74e1ff5acc3ff7e34f45e9

diff --git a/manifest b/manifest
index fb2f31f7541a32145ebaf454b7d609bf8434cd19..9a38cdcc38d24170d7e4955d9913738383bfffef 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Temporarily\sdisable\sextended\sIO\serror\scode\stests.\s(CVS\s5123)
-D 2008-05-12T12:41:15
+C Add\s"b"\sto\sfopen()\sin\sthe\shexio\stests\sso\sthat\sextra\scarriage\sreturns\sare\nnot\sinserted\son\swin32\sand\sOS/2.\s\sTest\sharness\schange\sonly\s-\sno\schanges\nto\sthe\score\sSQLite\scode.\s(CVS\s5124)
+D 2008-05-12T16:17:42
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 8b9b8263852f0217157f9042b8e3dae7427ec739
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -151,7 +151,7 @@ F src/test_btree.c c1308ba0b88ab577fa56c9e493a09829dfcded9c
 F src/test_config.c b910754c5ba311abf149457cdbfd66144e715b35
 F src/test_devsym.c cee1aecaa90c895030399ca4ae38f84a08038f8a
 F src/test_func.c f4aafa10f17d52c43a64b47717265802e6e552b3
-F src/test_hexio.c 1a1cd8324d57585ea86b922f609fa1fbaaf9662d
+F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
 F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8
 F src/test_malloc.c c92a65e8f9b31bb2b332448d92d2016c000a963d
 F src/test_md5.c bca40b727c57462ddb415e57c5323445a1bb1a40
@@ -634,7 +634,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 4d397f57c4446b18c5c6faf728d315495e4abf6e
-R 1c556d4a9c0199169dcb05dd36c94f41
-U danielk1977
-Z 241d5f247fc9377c219ce3169426d249
+P f204df3c3161ebe4f2c581715d708d0f35635c08
+R 8b9e27eafa1c023546360b6979e7421a
+U drh
+Z dcccd95cc4ae97b1d904c2ea71894790

diff --git a/manifest.uuid b/manifest.uuid
index d137b637f38b4e950f87c239734b77b8fbbfc14b..231a18c08f2b9376bd1bb378bcff05d864298096 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f204df3c3161ebe4f2c581715d708d0f35635c08
\ No newline at end of file
+68cbc6b45c98ebaeca74e1ff5acc3ff7e34f45e9
\ No newline at end of file

diff --git a/src/test_hexio.c b/src/test_hexio.c
index 4dc83e976618ecc59aba4689badc45e060d7271f..9e1e8de80d021b0f3d6deff62019e4195b2117d6 100644 (file)
--- a/src/test_hexio.c
+++ b/src/test_hexio.c
@@ -17,7 +17,7 @@
 ** with historical versions of the "binary" command.  So it seems
 ** easier and safer to build our own mechanism.
 **
-** $Id: test_hexio.c,v 1.6 2007/10/19 17:47:25 drh Exp $
+** $Id: test_hexio.c,v 1.7 2008/05/12 16:17:42 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -119,7 +119,10 @@ static int hexio_read(
   if( zBuf==0 ){
     return TCL_ERROR;
   }
-  in = fopen(zFile, "r");
+  in = fopen(zFile, "rb");
+  if( in==0 ){
+    in = fopen(zFile, "r");
+  }
   if( in==0 ){
     Tcl_AppendResult(interp, "cannot open input file ", zFile, 0);
     return TCL_ERROR;
@@ -168,7 +171,10 @@ static int hexio_write(
     return TCL_ERROR;
   }
   nOut = sqlite3TestHexToBin(zIn, nIn, aOut);
-  out = fopen(zFile, "r+");
+  out = fopen(zFile, "r+b");
+  if( out==0 ){
+    out = fopen(zFile, "r+");
+  }
   if( out==0 ){
     Tcl_AppendResult(interp, "cannot open output file ", zFile, 0);
     return TCL_ERROR;