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
Logging: add I= element to transport-defer lines. Bug 2675
[exim.git]
/
src
/
src
/
malware.c
diff --git
a/src/src/malware.c
b/src/src/malware.c
index 7ed4d358d983db82c30c7efd0d9f1c89c67f8f27..03bb832fc0131795bb1cb6858162ba0ba28f5507 100644
(file)
--- a/
src/src/malware.c
+++ b/
src/src/malware.c
@@
-220,6
+220,7
@@
extern uschar spooled_message_id[MESSAGE_ID_LENGTH+1];
/* Some (currently avast only) use backslash escaped whitespace,
this function undoes these escapes */
/* Some (currently avast only) use backslash escaped whitespace,
this function undoes these escapes */
+#ifndef DISABLE_MAL_AVAST
static inline void
unescape(uschar *p)
{
static inline void
unescape(uschar *p)
{
@@
-228,6
+229,7
@@
for (; *p; ++p)
if (*p == '\\' && (isspace(p[1]) || p[1] == '\\'))
for (p0 = p; *p0; ++p0) *p0 = p0[1];
}
if (*p == '\\' && (isspace(p[1]) || p[1] == '\\'))
for (p0 = p; *p0; ++p0) *p0 = p0[1];
}
+#endif
/* --- malware_*_defer --- */
static inline int
/* --- malware_*_defer --- */
static inline int
@@
-250,13
+252,6
@@
m_panic_defer(struct scan * scanent, const uschar * hostport,
return malware_panic_defer(string_sprintf("%s %s : %s",
scanent->name, hostport ? hostport : CUS"", str));
}
return malware_panic_defer(string_sprintf("%s %s : %s",
scanent->name, hostport ? hostport : CUS"", str));
}
-static inline int
-m_log_defer(struct scan * scanent, const uschar * hostport,
- const uschar * str)
-{
-return malware_log_defer(string_sprintf("%s %s : %s",
- scanent->name, hostport ? hostport : CUS"", str));
-}
/* --- m_*_defer_3 */
static inline int
m_panic_defer_3(struct scan * scanent, const uschar * hostport,
/* --- m_*_defer_3 */
static inline int
m_panic_defer_3(struct scan * scanent, const uschar * hostport,
@@
-386,6
+381,7
@@
return p - buffer;
}
/* return TRUE iff size as requested */
}
/* return TRUE iff size as requested */
+#ifndef DISABLE_MAL_DRWEB
static BOOL
recv_len(int sock, void * buf, int size, time_t tmo)
{
static BOOL
recv_len(int sock, void * buf, int size, time_t tmo)
{
@@
-393,6
+389,7
@@
return fd_ready(sock, tmo)
? recv(sock, buf, size, 0) == size
: FALSE;
}
? recv(sock, buf, size, 0) == size
: FALSE;
}
+#endif