projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EXPAND_LISTMATCH_RHS plumbed into build makefiles.
[exim.git]
/
src
/
src
/
moan.c
diff --git
a/src/src/moan.c
b/src/src/moan.c
index 5ef5fe42c3049ca508d573b204d740bdc06f6e34..6c04f7a570560a5f8d465e55ba935eed916de279 100644
(file)
--- a/
src/src/moan.c
+++ b/
src/src/moan.c
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/src/moan.c,v 1.8 2007/02/06 11:11:40 ph10 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
7
*/
+/* Copyright (c) University of Cambridge 1995 - 200
9
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for sending messages to sender or to mailmaster. */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for sending messages to sender or to mailmaster. */
@@
-437,8
+435,8
@@
Returns: nothing
*/
void
*/
void
-moan_tell_someone(uschar *who, address_item *addr,
uschar *subject,
- char *format, ...)
+moan_tell_someone(uschar *who, address_item *addr,
+ c
onst uschar *subject, const c
har *format, ...)
{
FILE *f;
va_list ap;
{
FILE *f;
va_list ap;
@@
-505,7
+503,7
@@
Returns: does not return; exits from the program
*/
void
*/
void
-moan_smtp_batch(uschar *cmd_buffer, char *format, ...)
+moan_smtp_batch(uschar *cmd_buffer, c
onst c
har *format, ...)
{
va_list ap;
int yield = (receive_messagecount > 0)? 1 : 2;
{
va_list ap;
int yield = (receive_messagecount > 0)? 1 : 2;
@@
-584,7
+582,7
@@
if (errors_copy == NULL) return NULL;
length of the local part. */
localpart = recipient;
length of the local part. */
localpart = recipient;
-domain = Ustrchr(recipient, '@');
+domain = Ustr
r
chr(recipient, '@');
if (domain == NULL) return NULL; /* should not occur, but avoid crash */
llen = domain++ - recipient;
if (domain == NULL) return NULL; /* should not occur, but avoid crash */
llen = domain++ - recipient;
@@
-610,10
+608,7
@@
while ((item = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer)))
if (match_address_list(recipient, TRUE, TRUE, &pattern, NULL, 0, UCHAR_MAX+1,
NULL) == OK)
{
if (match_address_list(recipient, TRUE, TRUE, &pattern, NULL, 0, UCHAR_MAX+1,
NULL) == OK)
{
- uschar temp[256];
- Ustrncpy(temp, localpart, llen);
- temp[llen] = 0;
- deliver_localpart = temp;
+ deliver_localpart = string_copyn(localpart, llen);
deliver_domain = domain;
yield = expand_string_copy(newaddress);
deliver_domain = deliver_localpart = NULL;
deliver_domain = domain;
yield = expand_string_copy(newaddress);
deliver_domain = deliver_localpart = NULL;