* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2024 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* A small freestanding program to build dbm databases from serial input. For
#include "exim.h"
-uschar * spool_directory = NULL; /* dummy for dbstuff.h */
+uschar * spool_directory = NULL; /* dummy for hintsdb.h */
/******************************************************************************/
/* dummies needed by Solaris build */
store_release_above_3(void *ptr, const char *func, int linenumber)
{ }
gstring *
+string_catn(gstring * g, const uschar * s, int count)
+{ return NULL; }
+gstring *
string_vformat_trc(gstring * g, const uschar * func, unsigned line,
unsigned size_limit, unsigned flags, const char *format, va_list ap)
{ return NULL; }
BOOL split_spool_directory;
-/* These introduced by the taintwarn handling */
-rmark
-store_mark_3(const char *func, int linenumber)
-{ return NULL; }
-#ifdef ALLOW_INSECURE_TAINTED_DATA
-BOOL allow_insecure_tainted_data;
-#endif
-
/******************************************************************************/
#endif /* STRERROR_FROM_ERRLIST */
-/* For Berkeley DB >= 2, we can define a function to be called in case of DB
-errors. This should help with debugging strange DB problems, e.g. getting "File
-exists" when you try to open a db file. The API changed at release 4.3. */
-
-#if defined(USE_DB) && defined(DB_VERSION_STRING)
-void
-# if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
-dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
-{
-dbenv = dbenv;
-# else
-dbfn_bdb_error_callback(const char *pfx, char *msg)
-{
-# endif
-pfx = pfx;
-printf("Berkeley DB error: %s\n", msg);
-}
-#endif
-
-
/*************************************************
* Interpret escape sequence *
BOOL warn = TRUE;
BOOL duperr = TRUE;
BOOL lastdup = FALSE;
-#if !defined (USE_DB) && !defined(USE_TDB) && !defined(USE_GDBM)
+#if !defined (USE_DB) && !defined(USE_TDB) && !defined(USE_GDBM) && !defined(USE_SQLITE)
int is_db = 0;
struct stat statbuf;
#endif
/* By default Berkeley db does not put extensions on... which
can be painful! */
-#if defined(USE_DB) || defined(USE_TDB) || defined(USE_GDBM)
+#if defined(USE_DB) || defined(USE_TDB) || defined(USE_GDBM) && !defined(USE_SQLITE)
if (Ustrcmp(argv[arg], argv[arg+1]) == 0)
{
printf("exim_dbmbuild: input and output filenames are the same\n");
/* It is apparently necessary to open with O_RDWR for this to work
with gdbm-1.7.3, though no reading is actually going to be done. */
-EXIM_DBOPEN(temp_dbmname, dirname, O_RDWR|O_CREAT|O_EXCL, 0644, &d);
-
-if (d == NULL)
+if (!(d = exim_dbopen(temp_dbmname, dirname, O_RDWR|O_CREAT|O_EXCL, 0644)))
{
printf("exim_dbmbuild: unable to create %s: %s\n", temp_dbmname,
strerror(errno));
/* Unless using native db calls, see if we have created <name>.db; if not,
assume .dir & .pag */
-#if !defined(USE_DB) && !defined(USE_TDB) && !defined(USE_GDBM)
+#if !defined(USE_DB) && !defined(USE_TDB) && !defined(USE_GDBM) && !defined(USE_SQLITE)
sprintf(CS real_dbmname, "%s.db", temp_dbmname);
is_db = Ustat(real_dbmname, &statbuf) == 0;
#endif
if (started)
{
- EXIM_DATUM_INIT(content);
- EXIM_DATUM_DATA(content) = (void *) buffer;
- EXIM_DATUM_SIZE(content) = bptr - buffer + add_zero;
+ exim_datum_init(&content);
+ exim_datum_data_set(&content, buffer);
+ exim_datum_size_set(&content, bptr - buffer + add_zero);
- switch(rc = EXIM_DBPUTB(d, key, content))
+ rc = exim_dbputb(d, &key, &content);
+ switch(rc)
{
case EXIM_DBPUTB_OK:
count++;
if (warn) fprintf(stderr, "** Duplicate key \"%s\"\n", keybuffer);
dupcount++;
if(duperr) yield = 1;
- if (lastdup) EXIM_DBPUT(d, key, content);
+ if (lastdup) exim_dbput(d, &key, &content);
break;
default:
bptr = buffer;
}
- EXIM_DATUM_INIT(key);
- EXIM_DATUM_DATA(key) = (void *) keybuffer;
+ exim_datum_init(&key);
+ exim_datum_data_set(&key, keybuffer);
/* Deal with quoted keys. Escape sequences always make one character
out of several, so we can re-build in place. */
s++;
}
if (*s != 0) s++; /* Past terminating " */
- EXIM_DATUM_SIZE(key) = t - keystart + add_zero;
+ exim_datum_size_set(&key, t - keystart + add_zero);
}
else
{
keystart = s;
- while (*s != 0 && *s != ':' && !isspace(*s)) s++;
- EXIM_DATUM_SIZE(key) = s - keystart + add_zero;
+ while (*s && *s != ':' && !isspace(*s)) s++;
+ exim_datum_size_set(&key, s - keystart + add_zero);
}
- if (EXIM_DATUM_SIZE(key) > 256)
+ if (exim_datum_size_get(&key) > 256)
{
printf("Keys longer than 255 characters cannot be handled\n");
started = 0;
}
if (lowercase)
- for (i = 0; i < EXIM_DATUM_SIZE(key) - add_zero; i++)
+ for (i = 0; i < exim_datum_size_get(&key) - add_zero; i++)
keybuffer[i] = tolower(keystart[i]);
else
- for (i = 0; i < EXIM_DATUM_SIZE(key) - add_zero; i++)
+ for (i = 0; i < exim_datum_size_get(&key) - add_zero; i++)
keybuffer[i] = keystart[i];
keybuffer[i] = 0;
started = 1;
- while (isspace(*s))s++;
+ while (isspace(*s)) s++;
if (*s == ':')
{
s++;
- while (isspace(*s))s++;
+ while (isspace(*s)) s++;
}
if (*s != 0)
{
if (started)
{
int rc;
- EXIM_DATUM_INIT(content);
- EXIM_DATUM_DATA(content) = (void *) buffer;
- EXIM_DATUM_SIZE(content) = bptr - buffer + add_zero;
+ exim_datum_init(&content);
+ exim_datum_data_set(&content, buffer);
+ exim_datum_size_set(&content, bptr - buffer + add_zero);
- switch(rc = EXIM_DBPUTB(d, key, content))
+ rc = exim_dbputb(d, &key, &content);
+ switch(rc)
{
case EXIM_DBPUTB_OK:
count++;
if (warn) fprintf(stderr, "** Duplicate key \"%s\"\n", keybuffer);
dupcount++;
if (duperr) yield = 1;
- if (lastdup) EXIM_DBPUT(d, key, content);
+ if (lastdup) exim_dbput(d, &key, &content);
break;
default:
TIDYUP:
-EXIM_DBCLOSE(d);
+exim_dbclose(d);
(void)fclose(f);
/* If successful, output the number of entries and rename the temporary
printf("%d duplicate key%s \n", dupcount, (dupcount > 1)? "s" : "");
}
- #if defined(USE_DB) || defined(USE_TDB) || defined(USE_GDBM)
+#if defined(USE_DB) || defined(USE_TDB) || defined(USE_GDBM) || defined(USE_SQLITE)
Ustrcpy(real_dbmname, temp_dbmname);
Ustrcpy(buffer, US argv[arg+1]);
if (Urename(real_dbmname, buffer) != 0)
printf("Unable to rename %s as %s\n", real_dbmname, buffer);
return 1;
}
- #else
+#else
/* Rename a single .db file */
}
}
- #endif /* USE_DB || USE_TDB || USE_GDBM */
+#endif /* USE_DB || USE_TDB || USE_GDBM || USE_SQLITE */
}
/* Otherwise unlink the temporary files. */
else
{
printf("dbmbuild abandoned\n");
-#if defined(USE_DB) || defined(USE_TDB) || defined(USE_GDBM)
+#if defined(USE_DB) || defined(USE_TDB) || defined(USE_GDBM) || defined(USE_SQLITE)
/* We created it, so safe to delete despite the name coming from outside */
/* coverity[tainted_string] */
Uunlink(temp_dbmname);
sprintf(CS real_dbmname, "%s.pag", temp_dbmname);
Uunlink(real_dbmname);
}
-#endif /* USE_DB || USE_TDB */
+#endif /* USE_DB || USE_TDB || USE_GDBM || USE_SQLITE */
}
return yield;
}
/* End of exim_dbmbuild.c */
+/* se aw ai sw=2
+*/
git://git.exim.org / exim.git / blobdiff