projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid the long whats_supported line being mixed with output from other processes
[exim.git]
/
src
/
src
/
functions.h
diff --git
a/src/src/functions.h
b/src/src/functions.h
index f789c5e2dee17098f8068efc974f304584ff14ef..efd039b5e940044f0a29de57fcd8a24b04b82141 100644
(file)
--- a/
src/src/functions.h
+++ b/
src/src/functions.h
@@
-13,6
+13,7
@@
are in in fact in separate headers. */
#ifndef _FUNCTIONS_H_
#define _FUNCTIONS_H_
#ifndef _FUNCTIONS_H_
#define _FUNCTIONS_H_
+#include <ctype.h>
#include <sys/time.h>
#include <sys/time.h>
@@
-118,7
+119,7
@@
extern int auth_get_data(uschar **, const uschar *, int);
extern int auth_get_no64_data(uschar **, uschar *);
extern int auth_prompt(const uschar *);
extern int auth_read_input(const uschar *);
extern int auth_get_no64_data(uschar **, uschar *);
extern int auth_prompt(const uschar *);
extern int auth_read_input(const uschar *);
-extern
void auth_show_supported(FILE
*);
+extern
gstring * auth_show_supported(gstring
*);
extern uschar *auth_xtextencode(uschar *, int);
extern int auth_xtextdecode(uschar *, uschar **);
extern uschar *auth_xtextencode(uschar *, int);
extern int auth_xtextdecode(uschar *, uschar **);
@@
-311,7
+312,7
@@
extern void mainlog_close(void);
extern int malware(const uschar *, int);
extern int malware_in_file(uschar *);
extern void malware_init(void);
extern int malware(const uschar *, int);
extern int malware_in_file(uschar *);
extern void malware_init(void);
-extern
void malware_show_supported(FILE
*);
+extern
gstring * malware_show_supported(gstring
*);
#endif
extern int match_address_list(const uschar *, BOOL, BOOL, const uschar **,
unsigned int *, int, int, const uschar **);
#endif
extern int match_address_list(const uschar *, BOOL, BOOL, const uschar **,
unsigned int *, int, int, const uschar **);
@@
-435,15
+436,15
@@
extern BOOL route_find_expanded_group(uschar *, uschar *, uschar *, gid_t *,
extern BOOL route_find_expanded_user(uschar *, uschar *, uschar *,
struct passwd **, uid_t *, uschar **);
extern void route_init(void);
extern BOOL route_find_expanded_user(uschar *, uschar *, uschar *,
struct passwd **, uid_t *, uschar **);
extern void route_init(void);
-extern
void route_show_supported(FILE
*);
+extern
gstring * route_show_supported(gstring
*);
extern void route_tidyup(void);
extern void route_tidyup(void);
-extern uschar *search_find(void *,
uschar *, uschar *, int, const
uschar *, int,
-
int, int
*);
+extern uschar *search_find(void *,
const uschar *,
uschar *, int,
+
const uschar *, int, int, int *, const uschar
*);
extern int search_findtype(const uschar *, int);
extern int search_findtype_partial(const uschar *, int *, const uschar **, int *,
extern int search_findtype(const uschar *, int);
extern int search_findtype_partial(const uschar *, int *, const uschar **, int *,
- int *);
-extern void *search_open(uschar *, int, int, uid_t *, gid_t *);
+ int *
, const uschar **
);
+extern void *search_open(
const
uschar *, int, int, uid_t *, gid_t *);
extern void search_tidyup(void);
extern void set_process_info(const char *, ...) PRINTF_FUNCTION(1,2);
extern void sha1_end(hctx *, const uschar *, int, uschar *);
extern void search_tidyup(void);
extern void set_process_info(const char *, ...) PRINTF_FUNCTION(1,2);
extern void sha1_end(hctx *, const uschar *, int, uschar *);
@@
-576,7
+577,7
@@
extern void transport_write_reset(int);
extern BOOL transport_write_string(int, const char *, ...);
extern BOOL transport_headers_send(transport_ctx *,
BOOL (*)(transport_ctx *, uschar *, int));
extern BOOL transport_write_string(int, const char *, ...);
extern BOOL transport_headers_send(transport_ctx *,
BOOL (*)(transport_ctx *, uschar *, int));
-extern
void transport_show_supported(FILE
*);
+extern
gstring * transport_show_supported(gstring
*);
extern BOOL transport_write_message(transport_ctx *, int);
extern void tree_add_duplicate(uschar *, address_item *);
extern void tree_add_nonrecipient(uschar *);
extern BOOL transport_write_message(transport_ctx *, int);
extern void tree_add_duplicate(uschar *, address_item *);
extern void tree_add_nonrecipient(uschar *);
@@
-666,6
+667,15
@@
return US strncpy(CS dst, CCS src, n);
/*XXX will likely need unchecked copy also */
/*XXX will likely need unchecked copy also */
+/* Advance the string pointer given over any whitespace.
+Return the next char as there's enought places using it to be useful. */
+
+#define Uskip_whitespace(sp) skip_whitespace(CUSS sp)
+
+static inline uschar skip_whitespace(const uschar ** sp)
+{ while (isspace(**sp)) (*sp)++; return **sp; }
+
+
/******************************************************************************/
#if !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY)
/******************************************************************************/
#if !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY)