X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdecode.c;h=cf1f4aeb796a40f720869f234bb9700d3ecbce62;hb=8f1901433ecc812a8e39cf2c41914196e61db6a2;hp=c3d0a8ed72a7fa6f17a775b9c6720f40cfedb824;hpb=e75e8817291f1504a58c70d721075d82293c9e72;p=citadel.git diff --git a/webcit/decode.c b/webcit/decode.c index c3d0a8ed7..cf1f4aeb7 100644 --- a/webcit/decode.c +++ b/webcit/decode.c @@ -3,17 +3,11 @@ * * This program is open source software. You can redistribute it and/or * modify it under the terms of the GNU General Public License, version 3. - * - * * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * - * - * */ #include "webcit.h" @@ -73,12 +67,12 @@ void utf8ify_rfc822_string(char **buf) { char encoding[16]; char istr[1024]; iconv_t ic = (iconv_t)(-1) ; - char *ibuf; /**< Buffer of characters to be converted */ - char *obuf; /**< Buffer for converted characters */ - size_t ibuflen; /**< Length of input buffer */ - size_t obuflen; /**< Length of output buffer */ - char *isav; /**< Saved pointer to input buffer */ - char *osav; /**< Saved pointer to output buffer */ + char *ibuf; /* Buffer of characters to be converted */ + char *obuf; /* Buffer for converted characters */ + size_t ibuflen; /* Length of input buffer */ + size_t obuflen; /* Length of output buffer */ + char *isav; /* Saved pointer to input buffer */ + char *osav; /* Saved pointer to output buffer */ int passes = 0; int i, len, delta; int illegal_non_rfc2047_encoding = 0; @@ -180,10 +174,10 @@ void utf8ify_rfc822_string(char **buf) { ibuf = malloc(1024); isav = ibuf; - if (!strcasecmp(encoding, "B")) { /**< base64 */ + if (!strcasecmp(encoding, "B")) { /* base64 */ ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr)); } - else if (!strcasecmp(encoding, "Q")) { /**< quoted-printable */ + else if (!strcasecmp(encoding, "Q")) { /* quoted-printable */ size_t len; long pos; @@ -198,7 +192,7 @@ void utf8ify_rfc822_string(char **buf) { ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len); } else { - strcpy(ibuf, istr); /**< unknown encoding */ + strcpy(ibuf, istr); /* unknown encoding */ ibuflen = strlen(istr); } @@ -260,16 +254,15 @@ inline void utf8ify_rfc822_string(char **a){}; -/** - * \brief RFC2047-encode a header field if necessary. - * If no non-ASCII characters are found, the string - * will be copied verbatim without encoding. +/* + * RFC2047-encode a header field if necessary. + * If no non-ASCII characters are found, the string will be copied verbatim without encoding. + * Returns encoded length; -1 if non success. * - * \param target Target buffer. - * \param maxlen Maximum size of target buffer. - * \param source Source string to be encoded. - * \param SourceLen Length of the source string - * \returns encoded length; -1 if non success. + * target Target buffer. + * maxlen Maximum size of target buffer. + * source Source string to be encoded. + * SourceLen Length of the source string */ int webcit_rfc2047encode(char *target, int maxlen, char *source, long SourceLen) {