diff -u --new-file /usr/src/xbuffy-3.4/fmt_rfc2047.c /usr/src/xbuffy-3.4-abl/fmt_rfc2047.c --- /usr/src/xbuffy-3.4/fmt_rfc2047.c Thu Jan 1 01:00:00 1970 +++ /usr/src/xbuffy-3.4-abl/fmt_rfc2047.c Mon Apr 23 09:50:59 2001 @@ -0,0 +1,301 @@ + +/* + * fmt_rfc2047.c -- decode RFC-2047 header format + * + * $Id: fmt_rfc2047.c,v 1.1.1.1 1999/04/30 18:08:34 doug Exp $ + * + * Copyright (c) 2000, the authors of nmh + * All rights reserved. + * + * Taken from the nmh-1.0.4 distribution and modified for xbuffy + * by Allan Beaufour Larsen + * + */ + + +#include + +static signed char hexindex[] = { + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1,-1,-1,-1,-1, + -1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1, + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, + -1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1, + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 +}; + +static signed char index_64[128] = { + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63, + 52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1,-1,-1,-1, + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14, + 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1, + -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40, + 41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1 +}; + +#define char64(c) (((unsigned char) (c) > 127) ? -1 : index_64[(unsigned char) (c)]) + + +/* + * Check if we can display a given character set natively. + * We are passed the length of the initial part of the + * string to check, since we want to allow the name of the + * character set to be a substring of a larger string. + */ + +int +check_charset (char *str, int len) +{ + static char *mm_charset = NULL; + static char *alt_charset = NULL; + static int mm_len; + static int alt_len; + + /* Cache the name of our default character set */ + if (!mm_charset) { + if (!(mm_charset = getenv ("MM_CHARSET"))) + mm_charset = "ISO-8859-1"; + mm_len = strlen (mm_charset); + + /* US-ASCII is a subset of the ISO-8859-X character sets */ + if (!strncasecmp("ISO-8859-", mm_charset, 9)) { + alt_charset = "US-ASCII"; + alt_len = strlen (alt_charset); + } + } + + /* Check if character set is OK */ + if ((len == mm_len) && !strncasecmp(str, mm_charset, mm_len)) + return 1; + if (alt_charset && (len == alt_len) && !strncasecmp(str, alt_charset, alt_len)) + return 1; + + return 0; +} + + +/* + * Return the name of the character set we are + * using for 8bit text. + */ +char * +write_charset_8bit (void) +{ + static char *mm_charset = NULL; + + /* + * Cache the name of the character set to + * use for 8bit text. + */ + if (!mm_charset && !(mm_charset = getenv ("MM_CHARSET"))) + mm_charset = "x-unknown"; + + return mm_charset; +} + +static int +unqp (unsigned char byte1, unsigned char byte2) +{ + if (hexindex[byte1] == -1 || hexindex[byte2] == -1) + return -1; + return (hexindex[byte1] << 4 | hexindex[byte2]); +} + +/* Check if character is linear whitespace */ +#define is_lws(c) ((c) == ' ' || (c) == '\t' || (c) == '\n') + + +/* + * Decode the string as a RFC-2047 header field + */ + +int +decode_rfc2047 (char *dst, char *str) +{ + char *p, *q, *pp; + char *startofmime, *endofmime; + int c, quoted_printable; + int encoding_found = 0; /* did we decode anything? */ + int between_encodings = 0; /* are we between two encodings? */ + int equals_pending = 0; /* is there a '=' pending? */ + int whitespace = 0; /* how much whitespace between encodings? */ + + if (!str) + return 0; + + /* + * Do a quick and dirty check for the '=' character. + * This should quickly eliminate many cases. + */ + if (!strchr (str, '=')) + return 0; + + for (p = str, q = dst; *p; p++) { + /* + * If we had an '=' character pending from + * last iteration, then add it first. + */ + if (equals_pending) { + *q++ = '='; + equals_pending = 0; + between_encodings = 0; /* we have added non-whitespace text */ + } + if (*p != '=') { + /* count linear whitespace while between encodings */ + if (between_encodings && is_lws(*p)) + whitespace++; + else + between_encodings = 0; /* we have added non-whitespace text */ + *q++ = *p; + continue; + } + + equals_pending = 1; /* we have a '=' pending */ + + /* Check for initial =? */ + if (*p == '=' && p[1] && p[1] == '?' && p[2]) { + startofmime = p + 2; + + /* Scan ahead for the next '?' character */ + for (pp = startofmime; *pp && *pp != '?'; pp++) + ; + + if (!*pp) + continue; + + + /* Check if character set is OK */ + if (!check_charset(startofmime, pp - startofmime)) + continue; + + startofmime = pp + 1; + + /* Check for valid encoding type */ + if (*startofmime != 'B' && *startofmime != 'b' && + *startofmime != 'Q' && *startofmime != 'q') + continue; + + /* Is encoding quoted printable or base64? */ + quoted_printable = (*startofmime == 'Q' || *startofmime == 'q'); + startofmime++; + + /* Check for next '?' character */ + if (*startofmime != '?') + continue; + startofmime++; + + /* + * Scan ahead for the ending ?= + * + * While doing this, we will also check if encoded + * word has any embedded linear whitespace. + */ + endofmime = NULL; + for (pp = startofmime; *pp && *(pp+1); pp++) { + if (is_lws(*pp)) { + break; + } else if (*pp == '?' && pp[1] == '=') { + endofmime = pp; + break; + } + } + if (is_lws(*pp) || endofmime == NULL) + continue; + + /* + * We've found an encoded word, so we can drop + * the '=' that was pending + */ + equals_pending = 0; + + /* + * If we are between two encoded words separated only by + * linear whitespace, then we ignore the whitespace. + * We will roll back the buffer the number of whitespace + * characters we've seen since last encoded word. + */ + if (between_encodings) + q -= whitespace; + + /* Now decode the text */ + if (quoted_printable) { + for (pp = startofmime; pp < endofmime; pp++) { + if (*pp == '=') { + c = unqp (pp[1], pp[2]); + if (c == -1) + continue; + if (c != 0) + *q++ = c; + pp += 2; + } else if (*pp == '_') { + *q++ = ' '; + } else { + *q++ = *pp; + } + } + } else { + /* base64 */ + int c1, c2, c3, c4; + + pp = startofmime; + while (pp < endofmime) { + /* 6 + 2 bits */ + while ((pp < endofmime) && + ((c1 = char64(*pp)) == -1)) { + pp++; + } + if (pp < endofmime) { + pp++; + } + while ((pp < endofmime) && + ((c2 = char64(*pp)) == -1)) { + pp++; + } + if (pp < endofmime && c1 != -1 && c2 != -1) { + *q++ = (c1 << 2) | (c2 >> 4); + pp++; + } + /* 4 + 4 bits */ + while ((pp < endofmime) && + ((c3 = char64(*pp)) == -1)) { + pp++; + } + if (pp < endofmime && c2 != -1 && c3 != -1) { + *q++ = ((c2 & 0xF) << 4) | (c3 >> 2); + pp++; + } + /* 2 + 6 bits */ + while ((pp < endofmime) && + ((c4 = char64(*pp)) == -1)) { + pp++; + } + if (pp < endofmime && c3 != -1 && c4 != -1) { + *q++ = ((c3 & 0x3) << 6) | (c4); + pp++; + } + } + } + + /* + * Now that we are done decoding this particular + * encoded word, advance string to trailing '='. + */ + p = endofmime + 1; + + encoding_found = 1; /* we found (at least 1) encoded word */ + between_encodings = 1; /* we have just decoded something */ + whitespace = 0; /* re-initialize amount of whitespace */ + } + } + + /* If an equals was pending at end of string, add it now. */ + if (equals_pending) + *q++ = '='; + *q = '\0'; + + return encoding_found; +} Common subdirectories: /usr/src/xbuffy-3.4/libdyn and /usr/src/xbuffy-3.4-abl/libdyn diff -u --new-file /usr/src/xbuffy-3.4/nntp.c /usr/src/xbuffy-3.4-abl/nntp.c --- /usr/src/xbuffy-3.4/nntp.c Thu Aug 19 18:41:48 1999 +++ /usr/src/xbuffy-3.4-abl/nntp.c Mon Apr 23 10:00:46 2001 @@ -171,8 +171,10 @@ *from = strdup(line); if (strncasecmp(line, "Subject:", 8) == 0) + { *subject = strdup(line); - + decode_rfc2047(*subject, line); + } } diff -u --new-file /usr/src/xbuffy-3.4/xbuffy.c /usr/src/xbuffy-3.4-abl/xbuffy.c --- /usr/src/xbuffy-3.4/xbuffy.c Thu Aug 19 18:41:49 1999 +++ /usr/src/xbuffy-3.4-abl/xbuffy.c Tue Apr 24 10:50:30 2001 @@ -26,6 +26,9 @@ John Reardon, Midnight Networks, badger@midnight.com, 1993. + Modified by Allan Beaufour Larsen , 2001, + to support MIME-encoded mailheaders (RFC2047) + */ @@ -69,6 +72,7 @@ +#include "fmt_rfc2047.c" void CheckBox(); void TimerBreakPopup(); @@ -309,7 +313,15 @@ if (data.center) /* center implies fill */ { - offset = ((maxBoxSize+4) - NEWstrlen(amt))/2; + offset = ((maxBoxSize+4) - ((int) NEWstrlen(amt)))/2; + /* Testing */ + if (offset > MAX_STRING) { + fprintf(stderr, "Warning, offset miscalculated: %i, setting to 0!\n", + offset); + fprintf(stderr, "maxBoxSize : %i, amt: --%s--, NEWstrlen(amt) : %i\n", + maxBoxSize, amt, NEWstrlen(amt)); + offset = 0; + } if (offset >0) ptr = fmtString+offset; else @@ -731,8 +743,9 @@ { if (header_cmp(buffer, "From", NULL)) { + if (!decode_rfc2047(From, buffer)) { strcpy(From, buffer); - + } } @@ -744,7 +757,9 @@ if (header_cmp(buffer, "Subject", NULL)) { - strcpy(Subject, buffer); + if (!decode_rfc2047(Subject, buffer)) { + strcpy(Subject, buffer); + } } if (header_cmp(buffer, "Status", NULL)) @@ -1244,7 +1259,7 @@ } else if (strcmp("-version", *argv) == 0) { - printf("%s\n", versionString); + printf("%s (RFC2047 modified by allan@beaufour.dk)\n", versionString); exit(0); } else if (strcmp("-news", *argv) == 0)