X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Flocal_scan.h;h=e0a97088f37b7087b9332ecf6c6c1f161115feb6;hb=b3317cfaabe29c73478125e14f58236b2229da4b;hp=978647847f062af9d38d2d8587e9d1d734ad9b98;hpb=d7d7b7b91dd75cec636fc144da7e27eed860f971;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/local_scan.h b/src/src/local_scan.h index 978647847..e0a97088f 100644 --- a/src/src/local_scan.h +++ b/src/src/local_scan.h @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/local_scan.h,v 1.6 2006/02/07 11:19:00 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2006 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ /* This file is the header that is the only Exim header to be included in the @@ -17,6 +15,7 @@ This API is also used for functions called by the ${dlfunc expansion item. */ /* Some basic types that make some things easier, the Exim configuration settings, and the store functions. */ +#include #include #include "config.h" #include "mytypes.h" @@ -99,8 +98,10 @@ ABI is changed in a non backward compatible way. The minor number is increased each time a new feature is added (in a way that doesn't break backward compatibility). */ -#define LOCAL_SCAN_ABI_VERSION_MAJOR 1 -#define LOCAL_SCAN_ABI_VERSION_MINOR 0 +#define LOCAL_SCAN_ABI_VERSION_MAJOR 3 +#define LOCAL_SCAN_ABI_VERSION_MINOR 1 +#define LOCAL_SCAN_ABI_VERSION \ + LOCAL_SCAN_ABI_VERSION_MAJOR.LOCAL_SCAN_ABI_VERSION_MINOR /* Structure definitions that are documented as visible in the function. */ @@ -114,12 +115,12 @@ typedef struct header_line { /* Entries in lists options are in this form. */ typedef struct { - char *name; - int type; - void *value; + const char *name; /* should have been uschar but too late now */ + int type; + void *value; } optionlist; -/*Structure for holding information about an envelope address. The errors_to +/* Structure for holding information about an envelope address. The errors_to field is always NULL except for one_time aliases that had errors_to on the routers that generated them. */ @@ -127,6 +128,8 @@ typedef struct recipient_item { uschar *address; /* the recipient address */ int pno; /* parent number for "one_time" alias, or -1 */ uschar *errors_to; /* the errors_to address or NULL */ + uschar *orcpt; /* DSN orcpt */ + int dsn_flags; /* DSN flags */ #ifdef EXPERIMENTAL_BRIGHTMAIL uschar *bmi_optin; #endif @@ -137,6 +140,8 @@ typedef struct recipient_item { extern unsigned int debug_selector; /* Debugging bits */ +extern int body_linecount; /* Line count in body */ +extern int body_zerocount; /* Binary zero count in body */ extern uschar *expand_string_message; /* Error info for failing expansion */ extern uschar *headers_charset; /* Charset for RFC 2047 decoding */ extern header_line *header_last; /* Final header */ @@ -162,14 +167,15 @@ extern BOOL smtp_input; /* TRUE if input is via SMTP */ extern int child_close(pid_t, int); extern pid_t child_open(uschar **, uschar **, int, int *, int *, BOOL); extern pid_t child_open_exim(int *); -extern void debug_printf(char *, ...) PRINTF_FUNCTION; +extern pid_t child_open_exim2(int *, uschar *, uschar *); +extern void debug_printf(const char *, ...) PRINTF_FUNCTION(1,2); extern uschar *expand_string(uschar *); -extern void header_add(int, char *, ...); -extern void header_add_at_position(BOOL, uschar *, BOOL, int, char *, ...); -extern void header_remove(int, uschar *); -extern BOOL header_testname(header_line *, uschar *, int, BOOL); -extern BOOL header_testname_incomplete(header_line *, uschar *, int, BOOL); -extern void log_write(unsigned int, int, char *format, ...); +extern void header_add(int, const char *, ...); +extern void header_add_at_position(BOOL, uschar *, BOOL, int, const char *, ...); +extern void header_remove(int, const uschar *); +extern BOOL header_testname(header_line *, const uschar *, int, BOOL); +extern BOOL header_testname_incomplete(header_line *, const uschar *, int, BOOL); +extern void log_write(unsigned int, int, const char *format, ...) PRINTF_FUNCTION(3,4); extern int lss_b64decode(uschar *, uschar **); extern uschar *lss_b64encode(uschar *, int); extern int lss_match_domain(uschar *, uschar *); @@ -180,9 +186,25 @@ extern void receive_add_recipient(uschar *, int); extern BOOL receive_remove_recipient(uschar *); extern uschar *rfc2047_decode(uschar *, BOOL, uschar *, int, int *, uschar **); extern int smtp_fflush(void); -extern void smtp_printf(char *, ...) PRINTF_FUNCTION; -extern uschar *string_copy(uschar *); -extern uschar *string_copyn(uschar *, int); -extern uschar *string_sprintf(char *, ...); +extern void smtp_printf(const char *, BOOL, ...) PRINTF_FUNCTION(1,3); +extern void smtp_vprintf(const char *, BOOL, va_list); + +#define string_sprintf(fmt, ...) \ + string_sprintf_trc(fmt, US __FUNCTION__, __LINE__, __VA_ARGS__) +extern uschar *string_sprintf_trc(const char *, const uschar *, unsigned, ...) ALMOST_PRINTF(1,4); + +#if defined(LOCAL_SCAN) || defined(DLFUNC_IMPL) +/* When compiling a local_scan() file we want to rename a published API, so that +we can use an inlined implementation in the compiles of the main Exim files, +with the original name. */ + +# define string_copy(s) string_copy_function(s) +# define string_copyn(s, n) string_copyn_function((s), (n)) +# define string_copy_taint(s, t) string_copy_taint_function((s), (t)) + +extern uschar * string_copy_function(const uschar *); +extern uschar * string_copyn_function(const uschar *, int n); +extern uschar * string_copy_taint_function(const uschar *, BOOL tainted); +#endif /* End of local_scan.h */