X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/7bca7fc46f67023eeeff53ebf8cf9bdb27f336c2..HEAD:/src/src/exim_dbmbuild.c diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c index 5a96f8a59..05387aa3f 100644 --- a/src/src/exim_dbmbuild.c +++ b/src/src/exim_dbmbuild.c @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ +/* Copyright (c) The Exim Maintainers 2020 - 2024 */ /* Copyright (c) University of Cambridge 1995 - 2018 */ /* 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 @@ -30,7 +32,7 @@ characters. */ #include "exim.h" -uschar * spool_directory = NULL; /* dummy for dbstuff.h */ +uschar * spool_directory = NULL; /* dummy for hintsdb.h */ /******************************************************************************/ /* dummies needed by Solaris build */ @@ -41,15 +43,18 @@ uschar * readconf_printtime(int t) { return NULL; } void * -store_get_3(int size, BOOL tainted, const char *filename, int linenumber) +store_get_3(int size, const void * proto_mem, const char *filename, int linenumber) { return NULL; } void ** -store_reset_3(void **ptr, int pool, const char *filename, int linenumber) +store_reset_3(void **ptr, const char *filename, int linenumber) { return NULL; } void 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; } @@ -69,6 +74,8 @@ struct global_flags f; unsigned int log_selector[1]; uschar * queue_name; BOOL split_spool_directory; + + /******************************************************************************/ @@ -95,26 +102,6 @@ return sys_errlist[n]; #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 * @@ -182,7 +169,7 @@ BOOL lowercase = TRUE; 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 @@ -212,7 +199,7 @@ while (argc > 1) if (argc != 3) { printf("usage: exim_dbmbuild [-nolc] \n"); - exit(1); + exit(EXIT_FAILURE); } if (Ustrcmp(argv[arg], "-") == 0) @@ -220,17 +207,17 @@ if (Ustrcmp(argv[arg], "-") == 0) else if (!(f = fopen(argv[arg], "rb"))) { printf("exim_dbmbuild: unable to open %s: %s\n", argv[arg], strerror(errno)); - exit(1); + exit(EXIT_FAILURE); } /* 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"); - exit(1); + exit(EXIT_FAILURE); } #endif @@ -240,7 +227,7 @@ if (Ustrcmp(argv[arg], argv[arg+1]) == 0) if (strlen(argv[arg+1]) > sizeof(temp_dbmname) - 20) { printf("exim_dbmbuild: output filename is ridiculously long\n"); - exit(1); + exit(EXIT_FAILURE); } Ustrcpy(temp_dbmname, US argv[arg+1]); @@ -255,20 +242,18 @@ else /* 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)); (void)fclose(f); - exit(1); + exit(EXIT_FAILURE); } /* Unless using native db calls, see if we have created .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 @@ -336,11 +321,12 @@ while (Ufgets(line, max_insize, f) != NULL) if (started) { - EXIM_DATUM_INIT(content); - EXIM_DATUM_DATA(content) = CS 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++; @@ -350,7 +336,7 @@ while (Ufgets(line, max_insize, f) != NULL) 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: @@ -363,8 +349,8 @@ while (Ufgets(line, max_insize, f) != NULL) bptr = buffer; } - EXIM_DATUM_INIT(key); - EXIM_DATUM_DATA(key) = CS 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. */ @@ -381,16 +367,16 @@ while (Ufgets(line, max_insize, f) != NULL) 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; @@ -399,20 +385,20 @@ while (Ufgets(line, max_insize, f) != NULL) } 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) { @@ -426,11 +412,12 @@ while (Ufgets(line, max_insize, f) != NULL) if (started) { int rc; - EXIM_DATUM_INIT(content); - EXIM_DATUM_DATA(content) = CS 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++; @@ -440,7 +427,7 @@ if (started) 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: @@ -455,7 +442,7 @@ if (started) TIDYUP: -EXIM_DBCLOSE(d); +exim_dbclose(d); (void)fclose(f); /* If successful, output the number of entries and rename the temporary @@ -469,7 +456,7 @@ if (yield == 0 || yield == 1) 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) @@ -477,7 +464,7 @@ if (yield == 0 || yield == 1) printf("Unable to rename %s as %s\n", real_dbmname, buffer); return 1; } - #else +#else /* Rename a single .db file */ @@ -513,7 +500,7 @@ if (yield == 0 || yield == 1) } } - #endif /* USE_DB || USE_TDB || USE_GDBM */ +#endif /* USE_DB || USE_TDB || USE_GDBM || USE_SQLITE */ } /* Otherwise unlink the temporary files. */ @@ -521,7 +508,7 @@ if (yield == 0 || yield == 1) 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); @@ -538,10 +525,12 @@ else 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 +*/