database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-10-27 08:52:26 +03:00
Code Activity

Report an error when attempting to open a directory as a database.

Browse Source 
Ticket #687. (CVS 1832)

FossilOrigin-Name: 4d77037be34b357d24d18d1e13b5f0df580b83ff
This commit is contained in:
drh
2004-07-20 01:14:13 +00:00
parent 78d153eecd
commit 6458e39c12
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Add\stest\sfor\screating\sindices\swith\squoted\snames.\s\sTicket\s#695.\s(CVS\s1831) C Report\san\serror\swhen\sattempting\sto\sopen\sa\sdirectory\sas\sa\sdatabase.\nTicket\s#687.\s(CVS\s1832)
D 2004-07-20T00:52:44 D 2004-07-20T01:14:14
F Makefile.in 4a5e570a9e2d35b09c31b3cf01b78cea764ade4b F Makefile.in 4a5e570a9e2d35b09c31b3cf01b78cea764ade4b
F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -47,7 +47,7 @@ F src/os_mac.c 3d31e26be1411acfb7961033098631b4f3486fdf
F src/os_mac.h 51d2445f47e182ed32d3bd6937f81070c6fd9bd4 F src/os_mac.h 51d2445f47e182ed32d3bd6937f81070c6fd9bd4
F src/os_test.c 6bf10100de2ca199a91fe7ac6474561c8a7166ae F src/os_test.c 6bf10100de2ca199a91fe7ac6474561c8a7166ae
F src/os_test.h 6a26a4978492e4bbdbf385554958418ff02db162 F src/os_test.h 6a26a4978492e4bbdbf385554958418ff02db162
F src/os_unix.c 4d5cb2f992235b6f3962410cbdbebcc7639f2e09 F src/os_unix.c ee607890d9062b51e27de56e9cb14a7f5a598d8c
F src/os_unix.h f3097815e041e82e24d92505e1ff61ba24172d13 F src/os_unix.h f3097815e041e82e24d92505e1ff61ba24172d13
F src/os_win.c 54181eb73cb4783c4241feca9eaa490768b39008 F src/os_win.c 54181eb73cb4783c4241feca9eaa490768b39008
F src/os_win.h babd4e912967c6b09088cfe38a45e8005a07ba44 F src/os_win.h babd4e912967c6b09088cfe38a45e8005a07ba44
@@ -237,7 +237,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
P 4e2ad572ea1800a2da1ea18548415c6fbf396259 P 7e72c5b7b5e355e41c30d4ef47268e11f4c97425
R 461b986bdadaf39c7881762f49ecc5d6 R b4c6362b87074d879cc3fd681a28fcb4
U drh U drh
Z 3a35dbd9e170bbf3665b9b1133e1f2cc Z 9721ff4beae05addd24530ad93eb95e5

2
manifest.uuid
View File

@@ -1 +1 @@
7e72c5b7b5e355e41c30d4ef47268e11f4c97425 4d77037be34b357d24d18d1e13b5f0df580b83ff

5
src/os_unix.c
View File

@@ -433,6 +433,11 @@ int sqlite3OsOpenReadWrite(
id->dirfd = -1; id->dirfd = -1;
id->h = open(zFilename, O_RDWR|O_CREAT|O_LARGEFILE|O_BINARY, 0644); id->h = open(zFilename, O_RDWR|O_CREAT|O_LARGEFILE|O_BINARY, 0644);
if( id->h<0 ){ if( id->h<0 ){
#ifdef EISDIR
if( errno==EISDIR ){
return SQLITE_CANTOPEN;
}
#endif
id->h = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY); id->h = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY);
if( id->h<0 ){ if( id->h<0 ){
return SQLITE_CANTOPEN; return SQLITE_CANTOPEN;