git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move errno-protection into string_open_failed()
[exim.git]
/
src
/
src
/
lookups
/
dsearch.c
diff --git
a/src/src/lookups/dsearch.c
b/src/src/lookups/dsearch.c
index 455273fb11d5cf92f4c7f435e5a225bad201a0a4..a6b331edb6401e2932caf3d6d3543d3e7e2f4add 100644
(file)
--- a/
src/src/lookups/dsearch.c
+++ b/
src/src/lookups/dsearch.c
@@
-31,9
+31,7
@@
dsearch_open(const uschar * dirname, uschar ** errmsg)
DIR * dp = exim_opendir(dirname);
if (!dp)
{
DIR * dp = exim_opendir(dirname);
if (!dp)
{
- int save_errno = errno;
- *errmsg = string_open_failed(errno, "%s for directory search", dirname);
- errno = save_errno;
+ *errmsg = string_open_failed("%s for directory search", dirname);
return NULL;
}
closedir(dp);
return NULL;
}
closedir(dp);
@@
-86,10
+84,6
@@
int save_errno;
uschar * filename;
unsigned flags = 0;
uschar * filename;
unsigned flags = 0;
-handle = handle; /* Keep picky compilers happy */
-length = length;
-do_cache = do_cache;
-
if (Ustrchr(keystring, '/') != 0)
{
*errmsg = string_sprintf("key for dsearch lookup contains a slash: %s",
if (Ustrchr(keystring, '/') != 0)
{
*errmsg = string_sprintf("key for dsearch lookup contains a slash: %s",
@@
-125,8
+119,7
@@
if ( Ulstat(filename, &statbuf) >= 0
&& S_ISDIR(statbuf.st_mode)
&& ( flags & FILTER_DIR
|| keystring[0] != '.'
&& S_ISDIR(statbuf.st_mode)
&& ( flags & FILTER_DIR
|| keystring[0] != '.'
- || keystring[1] != '.'
- || keystring[1] && keystring[2]
+ || keystring[1] && keystring[1] != '.'
) ) ) )
{
/* Since the filename exists in the filesystem, we can return a
) ) ) )
{
/* Since the filename exists in the filesystem, we can return a
@@
-135,10
+128,10
@@
if ( Ulstat(filename, &statbuf) >= 0
return OK;
}
return OK;
}
-if (errno == ENOENT) return FAIL;
+if (errno == ENOENT
|| errno == 0
) return FAIL;
save_errno = errno;
save_errno = errno;
-*errmsg = string_sprintf("%s: lstat
failed", filename
);
+*errmsg = string_sprintf("%s: lstat
: %s", filename, strerror(errno)
);
errno = save_errno;
return DEFER;
}
errno = save_errno;
return DEFER;
}