Attachment #146359 for bug #213639




#include "common.h"
#include "hdrutils.h"

int Slrn_Usascii_Override = 0;
int Slrn_Use_Meta_Mail = 1;
int Slrn_Fold_Headers = 1;
char *Slrn_MetaMail_Cmd;

	       b++;
	     len = b - charset;
	     
             if( (slrn_case_strncmp((unsigned char *)"us-ascii", charset,8) == 0) 
                   && (Slrn_Fallback_Input_Charset != NULL) && (Slrn_Usascii_Override != 0) )
             {
               a->mime.charset = slrn_safe_strmalloc(Slrn_Fallback_Input_Charset);
             }
             else
             {
	       a->mime.charset = slrn_safe_strnmalloc (charset, len);
             }
	     return 0;
	  }
	line = line->next;

Lines 31-36 Link Here

(-)src/mime.h (+1 lines)
31	extern Slrn_Mime_Error_Obj slrn_mime_header_encode (char , char );	31	extern Slrn_Mime_Error_Obj slrn_mime_header_encode (char , char );
32		32
33		33
		34	extern int Slrn_Usascii_Override;
34	extern int Slrn_Fold_Headers;	35	extern int Slrn_Fold_Headers;
35	extern int Slrn_Use_Meta_Mail;	36	extern int Slrn_Use_Meta_Mail;
36	extern char *Slrn_MetaMail_Cmd;	37	extern char *Slrn_MetaMail_Cmd;

Lines 631-636 Link Here

(-)src/startup.c (+1 lines)
631	#if !defined(IBMPC_SYSTEM)	631	#if !defined(IBMPC_SYSTEM)
632	{"use_blink", &SLtt_Blink_Mode, NULL},	632	{"use_blink", &SLtt_Blink_Mode, NULL},
633	#endif	633	#endif
		634	{"usascii_override", &Slrn_Usascii_Override},
634	{"warn_followup_to", &Slrn_Warn_Followup_To, NULL},	635	{"warn_followup_to", &Slrn_Warn_Followup_To, NULL},
635	{"wrap_flags", &Slrn_Wrap_Mode, NULL},	636	{"wrap_flags", &Slrn_Wrap_Mode, NULL},
636	{"wrap_method", &Slrn_Wrap_Method, NULL},	637	{"wrap_method", &Slrn_Wrap_Method, NULL},

Lines 43-49 Link Here

(-)src/version.c (-1 / +2 lines)
43	#include "art.h"	43	#include "art.h"
44	#include "snprintf.h"	44	#include "snprintf.h"
45		45
46	#define SLRN_VERSION_STRING_TW SLRN_VERSION_STRING"/mm"	46	#define SLRN_VERSION_STRING_TW SLRN_VERSION_STRING"/mm/ao"
47	char *Slrn_Version_String = SLRN_VERSION_STRING_TW;	47	char *Slrn_Version_String = SLRN_VERSION_STRING_TW;
48	int Slrn_Version = SLRN_VERSION;	48	int Slrn_Version = SLRN_VERSION;
49		49
Lines 95-100 Link Here
95	static char *included_patches[] =	95	static char *included_patches[] =
96	{	96	{
97	"minimal_multipart",	97	"minimal_multipart",
		98	"usascii_override",
98	""	99	""
99	};	100	};
100		101

Return to bug 213639

Lines 52-57 Link Here

(-)src/mime.c (-1 / +10 lines)
52	#include "common.h"	52	#include "common.h"
53	#include "hdrutils.h"	53	#include "hdrutils.h"
54		54
		55	int Slrn_Usascii_Override = 0;
55	int Slrn_Use_Meta_Mail = 1;	56	int Slrn_Use_Meta_Mail = 1;
56	int Slrn_Fold_Headers = 1;	57	int Slrn_Fold_Headers = 1;
57	char *Slrn_MetaMail_Cmd;	58	char *Slrn_MetaMail_Cmd;
Lines 201-207 Link Here
201	b++;	202	b++;
202	len = b - charset;	203	len = b - charset;
203		204
204	a->mime.charset = slrn_safe_strnmalloc (charset, len);	205	if( (slrn_case_strncmp((unsigned char *)"us-ascii", charset,8) == 0)
		206	&& (Slrn_Fallback_Input_Charset != NULL) && (Slrn_Usascii_Override != 0) )
		207	{
		208	a->mime.charset = slrn_safe_strmalloc(Slrn_Fallback_Input_Charset);
		209	}
		210	else
		211	{
		212	a->mime.charset = slrn_safe_strnmalloc (charset, len);
		213	}
205	return 0;	214	return 0;
206	}	215	}
207	line = line->next;	216	line = line->next;