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
SPDX: license tags (mostly by guesswork)
[exim.git]
/
src
/
src
/
lookups
/
dsearch.c
diff --git
a/src/src/lookups/dsearch.c
b/src/src/lookups/dsearch.c
index 455273fb11d5cf92f4c7f435e5a225bad201a0a4..6cae0dafbc4cc973e2f713dc51a7ec58015299ed 100644
(file)
--- a/
src/src/lookups/dsearch.c
+++ b/
src/src/lookups/dsearch.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-only */
/* The idea for this code came from Matthew Byng-Maddick, but his original has
been heavily reworked a lot for Exim 4 (and it now uses stat() (more precisely:
/* The idea for this code came from Matthew Byng-Maddick, but his original has
been heavily reworked a lot for Exim 4 (and it now uses stat() (more precisely:
@@
-31,9
+32,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
+85,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,20
+120,19
@@
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
non-tainted result. */
) ) ) )
{
/* Since the filename exists in the filesystem, we can return a
non-tainted result. */
- *result = string_copy_taint(flags & RET_FULL ? filename : keystring,
FALSE
);
+ *result = string_copy_taint(flags & RET_FULL ? filename : keystring,
GET_UNTAINTED
);
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;
}
@@
-165,12
+159,13
@@
handle = handle; /* Avoid compiler warning */
#include "../version.h"
#include "../version.h"
-void
-dsearch_version_report(
FILE *f
)
+gstring *
+dsearch_version_report(
gstring * g
)
{
#ifdef DYNLOOKUP
{
#ifdef DYNLOOKUP
-
fprintf(f
, "Library version: dsearch: Exim version %s\n", EXIM_VERSION_STR);
+
g = string_fmt_append(g
, "Library version: dsearch: Exim version %s\n", EXIM_VERSION_STR);
#endif
#endif
+return g;
}
}