From 5ae7af7cc2bea3b668daf80034b7b2d77292f8fb Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 18 Feb 2002 12:48:45 +0000 Subject: [PATCH] Enhancement to Windows "file-exists" function by Joel Lucsy. (CVS 374) FossilOrigin-Name: d3d59261da9bef3250e99444167ad6ef98764574 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/os.c | 15 +-------------- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/manifest b/manifest index b3b136efa9..160d77d9b7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Test\sand\sdocumentation\supdates\sfor\ssub-queries.\s(CVS\s373) -D 2002-02-18T03:21:46 +C Enhancement\sto\sWindows\s"file-exists"\sfunction\sby\sJoel\sLucsy.\s(CVS\s374) +D 2002-02-18T12:48:46 F Makefile.in 9fa4277413bf1d9cf91365f07d4108d7d87ed2af F Makefile.template 3372d45f8853afdb70bd30cc6fb50a3cd9069834 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0 @@ -29,7 +29,7 @@ F src/hash.h d1ce47900c7325af5e41c4feb4855c4bf2b841e7 F src/insert.c 98edfd1ae7da7558cbaad3ae5023e1ea271513a6 F src/main.c 300320ba68d3e5b22c2c5b2c07fa884878202181 F src/md5.c 52f677bfc590e09f71d07d7e327bd59da738d07c -F src/os.c 1953080d14098cd45e5bde88941567688efb72b1 +F src/os.c f6bc9b7ab530346bb7fef2ed39f2f1f214bc14ea F src/os.h a17596ecc7f38a228b83ecdb661fb03ce44726d6 F src/pager.c d261a3a0b4e96a400ef5432297edec09b041e9c7 F src/pager.h b28f004e2f5541dc60cc32db01bf80cf4d056283 @@ -123,7 +123,7 @@ F www/speed.tcl 83457b2bf6bb430900bd48ca3dd98264d9a916a5 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279 F www/tclsqlite.tcl 829b393d1ab187fd7a5e978631b3429318885c49 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218 -P 89ffa9ff132858b62a91df1fb7fe49b2d58c01e7 -R 7ab01fed9c641afece9998e0036b69da +P 607c0c49b2098771020514198cb1076de8245a62 +R 3af6afadbeb571c12afffc634ba291bc U drh -Z c93e572aa74a691d85a071d29df82a3d +Z 12bafaf1d5ee9acb4349af632ae545b5 diff --git a/manifest.uuid b/manifest.uuid index 80b85e59c9..acc602e4b3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -607c0c49b2098771020514198cb1076de8245a62 \ No newline at end of file +d3d59261da9bef3250e99444167ad6ef98764574 \ No newline at end of file diff --git a/src/os.c b/src/os.c index c544691b20..ae1368c284 100644 --- a/src/os.c +++ b/src/os.c @@ -210,20 +210,7 @@ int sqliteOsFileExists(const char *zFilename){ return access(zFilename, 0)==0; #endif #if OS_WIN - HANDLE h; - h = CreateFile(zFilename, - GENERIC_READ, - 0, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, - NULL - ); - if( h!=INVALID_HANDLE_VALUE ){ - CloseHandle(h); - return 1; - } - return 0; + return GetFileAttributes(zFilename) != 0xffffffff; #endif }