Diffstat (limited to 'kmicromail/libetpan/tools/charconv.c') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kmicromail/libetpan/tools/charconv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kmicromail/libetpan/tools/charconv.c b/kmicromail/libetpan/tools/charconv.c index bf3de51..f7a3c89 100644 --- a/kmicromail/libetpan/tools/charconv.c +++ b/kmicromail/libetpan/tools/charconv.c | |||
@@ -1,97 +1,97 @@ | |||
1 | /* | 1 | /* |
2 | * libEtPan! -- a mail stuff library | 2 | * libEtPan! -- a mail stuff library |
3 | * | 3 | * |
4 | * Copyright (C) 2001, 2002 - DINH Viet Hoa | 4 | * Copyright (C) 2001, 2002 - DINH Viet Hoa |
5 | * All rights reserved. | 5 | * All rights reserved. |
6 | * | 6 | * |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions |
9 | * are met: | 9 | * are met: |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. |
15 | * 3. Neither the name of the libEtPan! project nor the names of its | 15 | * 3. Neither the name of the libEtPan! project nor the names of its |
16 | * contributors may be used to endorse or promote products derived | 16 | * contributors may be used to endorse or promote products derived |
17 | * from this software without specific prior written permission. | 17 | * from this software without specific prior written permission. |
18 | * | 18 | * |
19 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | 19 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND |
20 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | 22 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
23 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 23 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
24 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | 24 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
25 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | 25 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
26 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 26 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
27 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 27 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
28 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 28 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
29 | * SUCH DAMAGE. | 29 | * SUCH DAMAGE. |
30 | */ | 30 | */ |
31 | 31 | ||
32 | /* | 32 | /* |
33 | * $Id$ | 33 | * $Id$ |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "charconv.h" | 36 | #include "charconv.h" |
37 | 37 | ||
38 | #include "config.h" | 38 | #include "config.h" |
39 | #ifdef HAVE_ICONV | 39 | #ifdef HAVE_ICONV |
40 | #include <iconv.h> | 40 | #include <iconv.h> |
41 | #endif | 41 | #endif |
42 | #include <stdlib.h> | 42 | #include <stdlib.h> |
43 | #include <string.h> | 43 | #include <string.h> |
44 | #include <stdio.h> | 44 | #include <stdio.h> |
45 | #include <errno.h> | 45 | #include <errno.h> |
46 | 46 | ||
47 | #include "mmapstring.h" | 47 | #include "mmapstring.h" |
48 | |||
49 | #ifdef HAVE_ICONV | 48 | #ifdef HAVE_ICONV |
49 | |||
50 | static size_t mail_iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, | 50 | static size_t mail_iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, |
51 | char **outbuf, size_t *outbytesleft, | 51 | char **outbuf, size_t *outbytesleft, |
52 | char **inrepls, char *outrepl) | 52 | char **inrepls, char *outrepl) |
53 | { | 53 | { |
54 | /* | 54 | /* |
55 | XXX - force conversion of (* inbuf) to (char *) | 55 | XXX - force conversion of (* inbuf) to (char *) |
56 | because prototype of iconv() is the following : | 56 | because prototype of iconv() is the following : |
57 | 57 | ||
58 | size_t iconv(iconv_t cd, char **restrict inbuf, | 58 | size_t iconv(iconv_t cd, char **restrict inbuf, |
59 | size_t *restrict inbytesleft, char **restrict outbuf, | 59 | size_t *restrict inbytesleft, char **restrict outbuf, |
60 | size_t *restrict outbytesleft); | 60 | size_t *restrict outbytesleft); |
61 | */ | 61 | */ |
62 | 62 | ||
63 | size_t ret = 0, ret1; | 63 | size_t ret = 0, ret1; |
64 | char *ib = (char *) *inbuf; | 64 | char *ib = (char *) *inbuf; |
65 | size_t ibl = *inbytesleft; | 65 | size_t ibl = *inbytesleft; |
66 | char *ob = *outbuf; | 66 | char *ob = *outbuf; |
67 | size_t obl = *outbytesleft; | 67 | size_t obl = *outbytesleft; |
68 | 68 | ||
69 | for (;;) | 69 | for (;;) |
70 | { | 70 | { |
71 | ret1 = iconv (cd, &ib, &ibl, &ob, &obl); | 71 | ret1 = iconv (cd, &ib, &ibl, &ob, &obl); |
72 | if (ret1 != (size_t)-1) | 72 | if (ret1 != (size_t)-1) |
73 | ret += ret1; | 73 | ret += ret1; |
74 | if (ibl && obl && errno == EILSEQ) | 74 | if (ibl && obl && errno == EILSEQ) |
75 | { | 75 | { |
76 | if (inrepls) | 76 | if (inrepls) |
77 | { | 77 | { |
78 | /* Try replacing the input */ | 78 | /* Try replacing the input */ |
79 | char **t; | 79 | char **t; |
80 | for (t = inrepls; *t; t++) | 80 | for (t = inrepls; *t; t++) |
81 | { | 81 | { |
82 | char *ib1 = *t; | 82 | char *ib1 = *t; |
83 | size_t ibl1 = strlen (*t); | 83 | size_t ibl1 = strlen (*t); |
84 | char *ob1 = ob; | 84 | char *ob1 = ob; |
85 | size_t obl1 = obl; | 85 | size_t obl1 = obl; |
86 | iconv (cd, &ib1, &ibl1, &ob1, &obl1); | 86 | iconv (cd, &ib1, &ibl1, &ob1, &obl1); |
87 | if (!ibl1) | 87 | if (!ibl1) |
88 | { | 88 | { |
89 | ++ib, --ibl; | 89 | ++ib, --ibl; |
90 | ob = ob1, obl = obl1; | 90 | ob = ob1, obl = obl1; |
91 | ++ret; | 91 | ++ret; |
92 | break; | 92 | break; |
93 | } | 93 | } |
94 | } | 94 | } |
95 | if (*t) | 95 | if (*t) |
96 | continue; | 96 | continue; |
97 | } | 97 | } |