File widechar.sidebar.dif of Package mutt.209

Overview Repositories Revisions Requests Users Attributes Meta

File widechar.sidebar.dif of Package mutt.209

--- handler.c
+++ handler.c	2013-04-22 00:00:00.000000000 +0000
@@ -778,7 +778,7 @@ static void enriched_set_flags (const wc
 static int text_enriched_handler (BODY *a, STATE *s)
 {
   enum {
-    TEXT, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE
+    TEXT, TEXT_GOTWC, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE
   } state = TEXT;
 
   long bytes = a->length;
@@ -807,7 +807,7 @@ static int text_enriched_handler (BODY *
   {
     if (state != ST_EOF)
     {
-      if (!bytes || (wc = fgetwc (s->fpin)) == WEOF)
+      if (state != TEXT_GOTWC && (!bytes || (fscanf (s->fpin, "%lc", &wc)) == EOF))
 	state = ST_EOF;
       else
 	bytes--;
@@ -815,6 +815,8 @@ static int text_enriched_handler (BODY *
 
     switch (state)
     {
+      case TEXT_GOTWC:
+	state = TEXT;
       case TEXT :
 	switch (wc)
 	{
@@ -875,9 +877,8 @@ static int text_enriched_handler (BODY *
 	  enriched_flush (&stte, 1);
 	else
 	{
-	  ungetwc (wc, s->fpin);
 	  bytes++;
-	  state = TEXT;
+	  state = TEXT_GOTWC;
 	}
 	break;
 
@@ -1490,7 +1491,7 @@ void mutt_decode_attachment (BODY *b, ST
  * strip all trailing spaces to improve interoperability;
  * if $text_flowed is unset, simply verbatim copy input
  */
-static int text_plain_handler (BODY *b, STATE *s)
+static int text_plain_handler (BODY *b __attribute__((unused)), STATE *s)
 {
   char *buf = NULL;
   size_t l = 0, sz = 0;
@@ -1518,7 +1519,6 @@ int mutt_body_handler (BODY *b, STATE *s
   int decode = 0;
   int plaintext = 0;
   FILE *fp = NULL;
-  char tempfile[_POSIX_PATH_MAX];
   handler_t handler = NULL;
   LOFF_T tmpoffset = 0;
   size_t tmplength = 0;
@@ -1528,6 +1528,8 @@ int mutt_body_handler (BODY *b, STATE *s
 #ifdef HAVE_FMEMOPEN
   char *temp;
   size_t tempsize;
+#else
+  char tempfile[_POSIX_PATH_MAX];
 #endif
 
   int oflags = s->flags;

Places

File widechar.sidebar.dif of Package mutt.209

Places