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
tidying
[exim.git]
/
src
/
src
/
exim_dbmbuild.c
diff --git
a/src/src/exim_dbmbuild.c
b/src/src/exim_dbmbuild.c
index a78e49f18df1d66cabecba0242bf5dd2a35bfc4a..02da079f696c77bb038da97509a84f28fce371b7 100644
(file)
--- a/
src/src/exim_dbmbuild.c
+++ b/
src/src/exim_dbmbuild.c
@@
-34,6
+34,12
@@
uschar * spool_directory = NULL; /* dummy for dbstuff.h */
/******************************************************************************/
/* dummies needed by Solaris build */
/******************************************************************************/
/* dummies needed by Solaris build */
+void
+millisleep(int msec)
+{}
+uschar *
+readconf_printtime(int t)
+{ return NULL; }
void *
store_get_3(int size, BOOL tainted, const char *filename, int linenumber)
{ return NULL; }
void *
store_get_3(int size, BOOL tainted, const char *filename, int linenumber)
{ return NULL; }
@@
-48,10
+54,18
@@
string_vformat_trc(gstring * g, const uschar * func, unsigned line,
unsigned size_limit, unsigned flags, const char *format, va_list ap)
{ return NULL; }
uschar *
unsigned size_limit, unsigned flags, const char *format, va_list ap)
{ return NULL; }
uschar *
-string_sprintf_trc(const char *
, const uschar *, unsigned
, ...)
+string_sprintf_trc(const char *
a, const uschar * b, unsigned c
, ...)
{ return NULL; }
{ return NULL; }
-BOOL split_spool_directory;
-uschar * queue_name;
+BOOL
+string_format_trc(uschar * buf, int len, const uschar * func, unsigned line,
+ const char * fmt, ...)
+{ return FALSE; }
+
+
+struct global_flags f;
+unsigned int log_selector[1];
+uschar * queue_name;
+BOOL split_spool_directory;
/******************************************************************************/
/******************************************************************************/
@@
-84,14
+98,14
@@
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 defined(USE_DB) && defined(DB_VERSION_STRING)
void
-#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+#
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;
dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
{
dbenv = dbenv;
-#else
+#
else
dbfn_bdb_error_callback(const char *pfx, char *msg)
{
dbfn_bdb_error_callback(const char *pfx, char *msg)
{
-#endif
+#
endif
pfx = pfx;
printf("Berkeley DB error: %s\n", msg);
}
pfx = pfx;
printf("Berkeley DB error: %s\n", msg);
}
@@
-117,6
+131,7
@@
string_interpret_escape(const uschar **pp)
int ch;
const uschar *p = *pp;
ch = *(++p);
int ch;
const uschar *p = *pp;
ch = *(++p);
+if (ch == '\0') return **pp;
if (isdigit(ch) && ch != '8' && ch != '9')
{
ch -= '0';
if (isdigit(ch) && ch != '8' && ch != '9')
{
ch -= '0';
@@
-197,14
+212,12
@@
if (argc != 3)
exit(1);
}
exit(1);
}
-if (Ustrcmp(argv[arg], "-") == 0) f = stdin; else
+if (Ustrcmp(argv[arg], "-") == 0)
+ f = stdin;
+else if (!(f = fopen(argv[arg], "rb")))
{
{
- f = fopen(argv[arg], "rb");
- if (f == NULL)
- {
- printf("exim_dbmbuild: unable to open %s: %s\n", argv[arg], strerror(errno));
- exit(1);
- }
+ printf("exim_dbmbuild: unable to open %s: %s\n", argv[arg], strerror(errno));
+ exit(1);
}
/* By default Berkeley db does not put extensions on... which
}
/* By default Berkeley db does not put extensions on... which