projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expansions: more detail in error messages
[exim.git]
/
src
/
src
/
rfc2047.c
diff --git
a/src/src/rfc2047.c
b/src/src/rfc2047.c
index e7853811e1152b5f9ba72c38f3f79e3816062fc1..8c79d9c64cadab87a35ad3784c076271f1db5724 100644
(file)
--- a/
src/src/rfc2047.c
+++ b/
src/src/rfc2047.c
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/src/rfc2047.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
5
*/
+/* Copyright (c) University of Cambridge 1995 - 200
9
*/
/* See the file NOTICE for conditions of use and distribution. */
/* This file contains a function for decoding message header lines that may
/* See the file NOTICE for conditions of use and distribution. */
/* This file contains a function for decoding message header lines that may
@@
-122,7
+120,7
@@
for (;; string = mimeword + 2)
encoding = toupper((*q1ptr)[1]);
**endptr = 0;
if (encoding == 'B')
encoding = toupper((*q1ptr)[1]);
**endptr = 0;
if (encoding == 'B')
- dlen =
auth_
b64decode(*q2ptr+1, dptrptr);
+ dlen = b64decode(*q2ptr+1, dptrptr);
else if (encoding == 'Q')
dlen = rfc2047_qpdecode(*q2ptr+1, dptrptr);
**endptr = '?'; /* restore */
else if (encoding == 'Q')
dlen = rfc2047_qpdecode(*q2ptr+1, dptrptr);
**endptr = '?'; /* restore */
@@
-279,7
+277,7
@@
while (mimeword != NULL)
else
{
DEBUG(D_any) debug_printf("iconv error translating \"%.*s\" to %s: "
else
{
DEBUG(D_any) debug_printf("iconv error translating \"%.*s\" to %s: "
- "%s\n",
endword + 2 - mimeword
, mimeword, target, strerror(errno));
+ "%s\n",
(int)(endword + 2 - mimeword)
, mimeword, target, strerror(errno));
}
}
}
}