database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Only use lstat() if the HAVE_LSTAT macro is defined. Fix some test file issues.

Browse Source 
FossilOrigin-Name: 8a6e4147a680ad6c5fdd588468b6daac82349d2c
This commit is contained in:
dan
2016-01-25 18:43:05 +00:00
parent caf6b150a1
commit af1b36b1df
6 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/os_unix.c
View File

@@ -480,7 +480,11 @@ static struct unix_syscall {
#endif
#define osReadlink ((ssize_t(*)(const char*,char*,size_t))aSyscall[26].pCurrent)
{ "lstat", (sqlite3_syscall_ptr)lstat, 0 },
#if defined(HAVE_LSTAT)
{ "lstat", (sqlite3_syscall_ptr)lstat, 0 },
#else
{ "lstat", (sqlite3_syscall_ptr)0, 0 },
#endif
#define osLstat ((int(*)(const char*,struct stat*))aSyscall[27].pCurrent)
}; /* End of the overrideable system calls */
@@ -5971,7 +5975,7 @@ static int unixFullPathname(
int nOut, /* Size of output buffer in bytes */
char *zOut /* Output buffer */
){
#if !defined(HAVE_READLINK)
#if !defined(HAVE_READLINK) || !defined(HAVE_LSTAT)
return mkFullPathname(zPath, zOut, nOut);
#else
int rc = SQLITE_OK;
@@ -5999,7 +6003,7 @@ static int unixFullPathname(
struct stat buf;
if( osLstat(zIn, &buf)!=0 ){
if( errno!=ENOENT ){
rc = unixLogError(SQLITE_CANTOPEN_BKPT, "stat", zIn);
rc = unixLogError(SQLITE_CANTOPEN_BKPT, "lstat", zIn);
}
}else{
bLink = S_ISLNK(buf.st_mode);
@@ -6044,7 +6048,7 @@ static int unixFullPathname(
sqlite3_free(zDel);
return rc;
#endif /* HAVE_READLINK */
#endif /* HAVE_READLINK && HAVE_LSTAT */
}