Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | 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) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
68cbc6b45c98ebaeca74e1ff5acc3ff7 |
| User & Date: | drh 2008-05-12 16:17:42 |
Context
|
2008-05-12
| ||
| 16:56 | check that DosWrite() was successful before trying again (CVS 5125) (check-in: 1ef6458b user: pweilbacher tags: trunk) | |
| 16:17 | 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) (check-in: 68cbc6b4 user: drh tags: trunk) | |
| 12:41 | Temporarily disable extended IO error code tests. (CVS 5123) (check-in: f204df3c user: danielk1977 tags: trunk) | |
Changes
Changes to src/test_hexio.c.
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 ... 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 ... 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 |
** implements TCL commands for reading and writing the binary ** database files and displaying the content of those files as ** hexadecimal. We could, in theory, use the built-in "binary" ** command of TCL to do a lot of this, but there are some issues ** 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 $ */ #include "sqliteInt.h" #include "tcl.h" #include <stdlib.h> #include <string.h> #include <assert.h> ................................................................................ if( Tcl_GetIntFromObj(interp, objv[2], &offset) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, objv[3], &amt) ) return TCL_ERROR; zFile = Tcl_GetString(objv[1]); zBuf = sqlite3_malloc( amt*2+1 ); if( zBuf==0 ){ return TCL_ERROR; } in = fopen(zFile, "r"); if( in==0 ){ Tcl_AppendResult(interp, "cannot open input file ", zFile, 0); return TCL_ERROR; } fseek(in, offset, SEEK_SET); got = fread(zBuf, 1, amt, in); fclose(in); ................................................................................ zFile = Tcl_GetString(objv[1]); zIn = (const unsigned char *)Tcl_GetStringFromObj(objv[3], &nIn); aOut = sqlite3_malloc( nIn/2 ); if( aOut==0 ){ return TCL_ERROR; } nOut = sqlite3TestHexToBin(zIn, nIn, aOut); out = fopen(zFile, "r+"); if( out==0 ){ Tcl_AppendResult(interp, "cannot open output file ", zFile, 0); return TCL_ERROR; } fseek(out, offset, SEEK_SET); written = fwrite(aOut, 1, nOut, out); sqlite3_free(aOut); |
| > > | > > > | > |
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 ... 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 ... 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 |
** implements TCL commands for reading and writing the binary ** database files and displaying the content of those files as ** hexadecimal. We could, in theory, use the built-in "binary" ** command of TCL to do a lot of this, but there are some issues ** with historical versions of the "binary" command. So it seems ** easier and safer to build our own mechanism. ** ** $Id: test_hexio.c,v 1.7 2008/05/12 16:17:42 drh Exp $ */ #include "sqliteInt.h" #include "tcl.h" #include <stdlib.h> #include <string.h> #include <assert.h> ................................................................................ if( Tcl_GetIntFromObj(interp, objv[2], &offset) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, objv[3], &amt) ) return TCL_ERROR; zFile = Tcl_GetString(objv[1]); zBuf = sqlite3_malloc( amt*2+1 ); if( zBuf==0 ){ return TCL_ERROR; } 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; } fseek(in, offset, SEEK_SET); got = fread(zBuf, 1, amt, in); fclose(in); ................................................................................ zFile = Tcl_GetString(objv[1]); zIn = (const unsigned char *)Tcl_GetStringFromObj(objv[3], &nIn); aOut = sqlite3_malloc( nIn/2 ); if( aOut==0 ){ return TCL_ERROR; } nOut = sqlite3TestHexToBin(zIn, nIn, aOut); 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; } fseek(out, offset, SEEK_SET); written = fwrite(aOut, 1, nOut, out); sqlite3_free(aOut); |