From: drh Date: Mon, 3 Sep 2007 17:42:17 +0000 (+0000) Subject: Unix OS interface returns SQLITE_CANTOPEN following a getcwd() failure. (CVS 4384) X-Git-Tag: version-3.6.10~1793 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70c01456e8fc3f0291f54501ef5d9994023ce719;p=thirdparty%2Fsqlite.git Unix OS interface returns SQLITE_CANTOPEN following a getcwd() failure. (CVS 4384) FossilOrigin-Name: ed15db4610bc6202c624234e48d234e0005825e4 --- diff --git a/manifest b/manifest index c52289efd7..fb0a9c8279 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\san\sunreachable\scase\sfrom\sxferOptimization().\sAlso\sother\sminor\stest\scoverage\simprovements.\s(CVS\s4383) -D 2007-09-03T17:30:07 +C Unix\sOS\sinterface\sreturns\sSQLITE_CANTOPEN\sfollowing\sa\sgetcwd()\sfailure.\s(CVS\s4384) +D 2007-09-03T17:42:17 F Makefile.in f3460f3363dd568c950a62f93e97eb19f6d069d8 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -116,7 +116,7 @@ F src/os_os2.c 8769301bff502de642ad2634cedcb77d967ce199 F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 -F src/os_unix.c 75521336c950555fae26288b61a3091fd6b0c367 +F src/os_unix.c 99bf97b31b29dd06c3833447ce03424e68b954f2 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_win.c d8909c199a5195f8d21be98216241370bdf93cdd F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b @@ -569,7 +569,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 40cf0c177635c087b7695a8c4c3b37da57f74425 -R f6b05a8d392e762308a90982daa6a0ca -U danielk1977 -Z 917ba269c58ddec092c1b31420c06b88 +P 75af7189c0ed1b24a32cff6960af7f17326cbc17 +R d974b2b8e4de54b819a75aec9af7c590 +U drh +Z 3f420eebd2feb9dc3ac3268ec79c16c2 diff --git a/manifest.uuid b/manifest.uuid index 82b22d12de..a54280d060 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -75af7189c0ed1b24a32cff6960af7f17326cbc17 \ No newline at end of file +ed15db4610bc6202c624234e48d234e0005825e4 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 02db7eab67..4cdde299a6 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -2550,7 +2550,7 @@ static int unixFullPathname(sqlite3_vfs *pVfs, const char *zPath, char *zOut){ }else{ int nCwd; if( getcwd(zOut, MAX_PATHNAME-1)==0 ){ - return SQLITE_ERROR; + return SQLITE_CANTOPEN; } nCwd = strlen(zOut); sqlite3_snprintf(MAX_PATHNAME-nCwd, &zOut[nCwd], "/%s", zPath);