Use sqliteOsFileExists() in the debugging hook in vdbe.c, instead of access().

Ticket #341. (CVS 1014)

FossilOrigin-Name: 7d3405b95bae74e0c476a7bdf708ca518723eaf7
This commit is contained in:
drh 2003-06-07 11:33:45 +00:00
parent 94ce4c1e3b
commit 6f8fd3c171
3 changed files with 10 additions and 12 deletions

View File

@ -1,5 +1,5 @@
C Do\snot\sassume\sthat\sa\spointer\scan\sfit\sin\sa\slong\sinside\sthe\sprintf()\scode.\nTicket\s#342.\s(CVS\s1013) C Use\ssqliteOsFileExists()\sin\sthe\sdebugging\shook\sin\svdbe.c,\sinstead\sof\saccess().\nTicket\s#341.\s(CVS\s1014)
D 2003-06-07T11:29:50 D 2003-06-07T11:33:45
F Makefile.in 98a14dc13a78ca0e12007e974c93aeb098db7f68 F Makefile.in 98a14dc13a78ca0e12007e974c93aeb098db7f68
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@ -59,7 +59,7 @@ F src/trigger.c 6ff205aaac4869e402d9902e528e1d22a85de14c
F src/update.c 24260b4fda00c9726d27699a0561d53c0dccc397 F src/update.c 24260b4fda00c9726d27699a0561d53c0dccc397
F src/util.c 566c7780170dd11fb1ad5de3ba81f0dfea7cccf0 F src/util.c 566c7780170dd11fb1ad5de3ba81f0dfea7cccf0
F src/vacuum.c 0820984615786c9ccdaad8032a792309b354a8eb F src/vacuum.c 0820984615786c9ccdaad8032a792309b354a8eb
F src/vdbe.c 5602825b5f71496963997985de773ad4750eba65 F src/vdbe.c 828123ca4a28b7b5432ca4dc39e4ad91484ddabf
F src/vdbe.h 985c24f312d10f9ef8f9a8b8ea62fcdf68e82f21 F src/vdbe.h 985c24f312d10f9ef8f9a8b8ea62fcdf68e82f21
F src/where.c 1e645d430cb4b347159c28c6085e9801160f2099 F src/where.c 1e645d430cb4b347159c28c6085e9801160f2099
F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242 F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
@ -165,7 +165,7 @@ F www/speed.tcl 296cc5632d069b56d3ef5409ca0df90f486c10fb
F www/sqlite.tcl 4bd1729e320f5fa9125f0022b281fbe839192125 F www/sqlite.tcl 4bd1729e320f5fa9125f0022b281fbe839192125
F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
F www/vdbe.tcl 14fdcc7fe8a60a6ba8584903636db8dc37eef26a F www/vdbe.tcl 14fdcc7fe8a60a6ba8584903636db8dc37eef26a
P 787d986d0f391d26eef7a2639594c465f9599f5b P 5dad7c05e9789e101d5ce75a6f3ea2ffb278b29d
R e6e651d4a1ca867cdb1d1a1cc51b5f22 R 14326af17af8b228ddca6070dcaf4ff4
U drh U drh
Z ae9940e2c16a990723b9c10b3754bf84 Z 266945e115d9e22002a3c382885d3cfd

View File

@ -1 +1 @@
5dad7c05e9789e101d5ce75a6f3ea2ffb278b29d 7d3405b95bae74e0c476a7bdf708ca518723eaf7

View File

@ -36,9 +36,10 @@
** in this file for details. If in doubt, do not deviate from existing ** in this file for details. If in doubt, do not deviate from existing
** commenting and indentation practices when changing or adding code. ** commenting and indentation practices when changing or adding code.
** **
** $Id: vdbe.c,v 1.226 2003/06/04 16:24:40 drh Exp $ ** $Id: vdbe.c,v 1.227 2003/06/07 11:33:45 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include "os.h"
#include <ctype.h> #include <ctype.h>
/* /*
@ -1497,9 +1498,6 @@ void sqliteVdbeMakeReady(
int isExplain /* True if the EXPLAIN keywords is present */ int isExplain /* True if the EXPLAIN keywords is present */
){ ){
int n; int n;
#ifdef MEMORY_DEBUG
extern int access(const char*,int);
#endif
assert( p!=0 ); assert( p!=0 );
assert( p->aStack==0 ); assert( p->aStack==0 );
@ -1524,7 +1522,7 @@ void sqliteVdbeMakeReady(
sqliteHashInit(&p->agg.hash, SQLITE_HASH_BINARY, 0); sqliteHashInit(&p->agg.hash, SQLITE_HASH_BINARY, 0);
p->agg.pSearch = 0; p->agg.pSearch = 0;
#ifdef MEMORY_DEBUG #ifdef MEMORY_DEBUG
if( access("vdbe_trace",0)==0 ){ if( sqliteOsFileExists("vdbe_trace") ){
p->trace = stdout; p->trace = stdout;
} }
#endif #endif