typoes

[exim.git] / src / src / lookups / json.c

diff --git a/src/src/lookups/json.c b/src/src/lookups/json.c
index 15b8617512f07d666d8ac918345089b3f66af0a5..43575cacff7a24f455ef068c4596f0583e39244a 100644 (file)
--- a/src/src/lookups/json.c
+++ b/src/src/lookups/json.c
@@ -2,8 +2,10 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) Jeremy Harris 2019 */
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
+/* Copyright (c) Jeremy Harris 2019 - 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-or-later */

 
 #include "../exim.h"
 #include "lf_functions.h"
 
 #include "../exim.h"
 #include "lf_functions.h"


@@ -23,7 +25,7 @@ Assume that the file is trusted, so no tainting */
 static void *
 json_malloc(size_t nbytes)
 {
 static void *
 json_malloc(size_t nbytes)
 {

-void * p = store_get((int)nbytes, FALSE);
+void * p = store_get((int)nbytes, GET_UNTAINTED);

 /* debug_printf("%s %d: %p\n", __FUNCTION__, (int)nbytes, p); */
 return p;
 }
 /* debug_printf("%s %d: %p\n", __FUNCTION__, (int)nbytes, p); */
 return p;
 }


@@ -40,19 +42,14 @@ json_free(void * p)
 /* See local README for interface description */
 
 static void *
 /* See local README for interface description */
 
 static void *

-json_open(uschar *filename, uschar **errmsg)
+json_open(const uschar * filename, uschar ** errmsg)

 {
 FILE * f;
 
 json_set_alloc_funcs(json_malloc, json_free);
 
 if (!(f = Ufopen(filename, "rb")))
 {
 FILE * f;
 
 json_set_alloc_funcs(json_malloc, json_free);
 
 if (!(f = Ufopen(filename, "rb")))

-  {
-  int save_errno = errno;
-  *errmsg = string_open_failed(errno, "%s for json search", filename);
-  errno = save_errno;
-  return NULL;
-  }
+  *errmsg = string_open_failed("%s for json search", filename);

 return f;
 }
 
 return f;
 }
 


@@ -63,7 +60,7 @@ return f;
 *************************************************/
 
 static BOOL
 *************************************************/
 
 static BOOL

-json_check(void *handle, uschar *filename, int modemask, uid_t *owners,
+json_check(void *handle, const uschar *filename, int modemask, uid_t *owners,

   gid_t *owngroups, uschar **errmsg)
 {
 return lf_check_file(fileno((FILE *)handle), filename, S_IFREG, modemask,
   gid_t *owngroups, uschar **errmsg)
 {
 return lf_check_file(fileno((FILE *)handle), filename, S_IFREG, modemask,


@@ -79,8 +76,9 @@ return lf_check_file(fileno((FILE *)handle), filename, S_IFREG, modemask,
 /* See local README for interface description */
 
 static int
 /* See local README for interface description */
 
 static int

-json_find(void *handle, uschar *filename, const uschar *keystring, int length,
-  uschar **result, uschar **errmsg, uint *do_cache)
+json_find(void * handle, const uschar * filename, const uschar * keystring,
+  int length, uschar ** result, uschar ** errmsg, uint * do_cache,
+  const uschar * opts)

 {
 FILE * f = handle;
 json_t * j, * j0;
 {
 FILE * f = handle;
 json_t * j, * j0;


@@ -88,9 +86,6 @@ json_error_t jerr;
 uschar * key;
 int sep = 0;
 
 uschar * key;
 int sep = 0;
 

-length = length;       /* Keep picky compilers happy */
-do_cache = do_cache;   /* Keep picky compilers happy */
-

 rewind(f);
 if (!(j = json_loadf(f, 0, &jerr)))
   {
 rewind(f);
 if (!(j = json_loadf(f, 0, &jerr)))
   {


@@ -164,23 +159,23 @@ json_close(void *handle)
 
 #include "../version.h"
 
 
 #include "../version.h"
 

-void
-json_version_report(FILE *f)
+gstring *
+json_version_report(gstring * g)

 {
 {

-fprintf(f, "Library version: json: Jansonn version %s\n", JANSSON_VERSION);
+return string_fmt_append(g, "Library version: json: Jansonn version %s\n", JANSSON_VERSION);

 }
 
 
 static lookup_info json_lookup_info = {
 }
 
 
 static lookup_info json_lookup_info = {

-  US"json",                      /* lookup name */
-  lookup_absfile,                /* uses absolute file name */
-  json_open,                  /* open function */
-  json_check,                 /* check function */
-  json_find,                  /* find function */
-  json_close,                 /* close function */
-  NULL,                          /* no tidy function */
-  NULL,                          /* no quoting function */
-  json_version_report         /* version reporting */
+  .name = US"json",                    /* lookup name */
+  .type = lookup_absfile,              /* uses absolute file name */
+  .open = json_open,                   /* open function */
+  .check = json_check,                 /* check function */
+  .find = json_find,                   /* find function */
+  .close = json_close,                 /* close function */
+  .tidy = NULL,                                /* no tidy function */
+  .quote = NULL,                       /* no quoting function */
+  .version_report = json_version_report         /* version reporting */

 };
 
 
 };