X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fmytypes.h;h=a3496a2986634400a00f9f204f4ed643e62f3b7b;hb=8cfc4d82fc84825b3a673aa140fc561042e32b70;hp=36860a892626e4cbe9a6c01a21b880e642d928eb;hpb=0a49a7a4f1090b6f1ce1d0f9d969804c9226b53e;p=exim.git diff --git a/src/src/mytypes.h b/src/src/mytypes.h index 36860a892..a3496a298 100644 --- a/src/src/mytypes.h +++ b/src/src/mytypes.h @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/mytypes.h,v 1.7 2009/11/16 19:50:37 nm4 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -15,26 +13,44 @@ local_scan.h includes it and exim.h includes them both (to get this earlier). */ #ifndef MYTYPES_H #define MYTYPES_H +# include + #ifndef FALSE -#define FALSE 0 +# define FALSE 0 #endif #ifndef TRUE -#define TRUE 1 +# define TRUE 1 #endif #ifndef TRUE_UNSET -#define TRUE_UNSET 2 +# define TRUE_UNSET 2 #endif /* If gcc is being used to compile Exim, we can use its facility for checking the arguments of printf-like functions. This is done by a macro. */ -#ifdef __GNUC__ -#define PRINTF_FUNCTION(A,B) __attribute__((format(printf,A,B))) +#if defined(__GNUC__) || defined(__clang__) +# define PRINTF_FUNCTION(A,B) __attribute__((format(printf,A,B))) +# define ARG_UNUSED __attribute__((__unused__)) +# define WARN_UNUSED_RESULT __attribute__((__warn_unused_result__)) +# define ALLOC __attribute__((malloc)) +# define ALLOC_SIZE(A) __attribute__((alloc_size(A))) +# define NORETURN __attribute__((noreturn)) +#else +# define PRINTF_FUNCTION(A,B) +# define ARG_UNUSED /**/ +# define WARN_UNUSED_RESULT /**/ +# define ALLOC /**/ +# define ALLOC_SIZE(A) /**/ +# define NORETURN /**/ +#endif + +#ifdef WANT_DEEPER_PRINTF_CHECKS +# define ALMOST_PRINTF(A, B) PRINTF_FUNCTION(A, B) #else -#define PRINTF_FUNCTION(A,B) +# define ALMOST_PRINTF(A, B) #endif @@ -42,8 +58,10 @@ the arguments of printf-like functions. This is done by a macro. */ the standard header files, so we use "uschar". Solaris has u_char in sys/types.h. This is just a typing convenience, of course. */ -typedef int BOOL; typedef unsigned char uschar; +typedef unsigned BOOL; +/* We also have SIGNAL_BOOL, which requires signal.h be included, so is defined +elsewhere */ /* These macros save typing for the casting that is needed to cope with the @@ -58,6 +76,8 @@ almost always literal strings. */ #define US (unsigned char *) #define CUS (const unsigned char *) #define USS (unsigned char **) +#define CUSS (const unsigned char **) +#define CCSS (const char **) /* The C library string functions expect "char *" arguments. Use macros to avoid having to write a cast each time. We do this for string and file @@ -68,32 +88,31 @@ functions that are called quite often; for other calls to external libraries #define Uatol(s) atol(CCS(s)) #define Uchdir(s) chdir(CCS(s)) #define Uchmod(s,n) chmod(CCS(s),n) -#define Uchown(s,n,m) chown(CCS(s),n,m) #define Ufgets(b,n,f) fgets(CS(b),n,f) -#define Ufopen(s,t) fopen(CCS(s),CCS(t)) +#define Ufopen(s,t) exim_fopen(CCS(s),CCS(t)) #define Ulink(s,t) link(CCS(s),CCS(t)) #define Ulstat(s,t) lstat(CCS(s),t) -#ifdef O_BINARY /* This is for Cygwin, */ -#define Uopen(s,n,m) open(CCS(s),(n)|O_BINARY,m) /* where all files must */ -#else /* be opened as binary */ -#define Uopen(s,n,m) open(CCS(s),n,m) /* to avoid problems */ -#endif /* with CRLF endings. */ +#ifdef O_BINARY /* This is for Cygwin, */ +# define Uopen(s,n,m) exim_open(CCS(s),(n)|O_BINARY,m) /* where all files must */ +# define Uopen2(s,n) exim_open2(CCS(s),(n)|O_BINARY) +#else /* be opened as binary */ +# define Uopen(s,n,m) exim_open(CCS(s),n,m) /* to avoid problems */ +# define Uopen2(s,n) exim_open2(CCS(s),n) +#endif /* with CRLF endings. */ #define Uread(f,b,l) read(f,CS(b),l) #define Urename(s,t) rename(CCS(s),CCS(t)) #define Ustat(s,t) stat(CCS(s),t) -#define Ustrcat(s,t) strcat(CS(s),CCS(t)) #define Ustrchr(s,n) US strchr(CCS(s),n) #define CUstrchr(s,n) CUS strchr(CCS(s),n) #define CUstrerror(n) CUS strerror(n) #define Ustrcmp(s,t) strcmp(CCS(s),CCS(t)) -#define Ustrcpy(s,t) strcpy(CS(s),CCS(t)) +#define Ustrcpy_nt(s,t) strcpy(CS s, CCS t) /* no taint check */ #define Ustrcspn(s,t) strcspn(CCS(s),CCS(t)) #define Ustrftime(s,m,f,t) strftime(CS(s),m,f,t) #define Ustrlen(s) (int)strlen(CCS(s)) -#define Ustrncat(s,t,n) strncat(CS(s),CCS(t),n) #define Ustrncmp(s,t,n) strncmp(CCS(s),CCS(t),n) -#define Ustrncpy(s,t,n) strncpy(CS(s),CCS(t),n) +#define Ustrncpy_nt(s,t,n) strncpy(CS s, CCS t, n) /* no taint check */ #define Ustrpbrk(s,t) strpbrk(CCS(s),CCS(t)) #define Ustrrchr(s,n) US strrchr(CCS(s),n) #define CUstrrchr(s,n) CUS strrchr(CCS(s),n) @@ -104,6 +123,18 @@ functions that are called quite often; for other calls to external libraries #define Ustrtol(s,t,b) strtol(CCS(s),CSS(t),b) #define Ustrtoul(s,t,b) strtoul(CCS(s),CSS(t),b) #define Uunlink(s) unlink(CCS(s)) + +#if defined(EM_VERSION_C) || defined(LOCAL_SCAN) || defined(DLFUNC_IMPL) +# define Ustrcat(s,t) strcat(CS(s), CCS(t)) +# define Ustrcpy(s,t) strcpy(CS(s), CCS(t)) +# define Ustrncat(s,t,n) strncat(CS(s), CCS(t), n) +# define Ustrncpy(s,t,n) strncpy(CS(s), CCS(t), n) +#else +# define Ustrcat(s,t) __Ustrcat(s, CUS(t), __FUNCTION__, __LINE__) +# define Ustrcpy(s,t) __Ustrcpy(s, CUS(t), __FUNCTION__, __LINE__) +# define Ustrncat(s,t,n) __Ustrncat(s, CUS(t), n, __FUNCTION__, __LINE__) +# define Ustrncpy(s,t,n) __Ustrncpy(s, CUS(t), n, __FUNCTION__, __LINE__) #endif +#endif /* End of mytypes.h */