Changeset 835:6f4b052f193a for charset.c

Timestamp:

1999-02-03 14:14:08 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

[unstable] Produce some reasonable character set support when
postponing messages.

Additionally, this patch fixes a nasty pointer leak in
load_charset() [noted with electric fence], and a completely
mis-lead attempt to use bsearch(). Apparently, nobody ever tested
the utf8 decoder for quite some time.

Files:

• charset.c (modified) (13 diffs)

charset.c

@@ -33 +33 @@
 #include <dirent.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "mutt.h"
@@ -78 +79 @@
 static void canonical_charset (char *dest, size_t dlen, const char *name)
 {
-  int i;
+  size_t i;
 
   if (!strncasecmp (name, "x-", 2))
@@ -97 +98 @@
 {
   CHARSET *cp = safe_malloc (sizeof (CHARSET));
-  short i;
+  size_t i;
 
   cp->n_symb = 256;
@@ -245 +246 @@
   for (s = symbol, d = symbol; *s; *d++ = *s++)
   {
-    if (*s == m->escape_char)
-      s++;
-  }
-
+    if (*s == m->escape_char && !*++s)
+      break;
+  }
+  
   *d = *s;
 }
@@ -421 +422 @@
     else if (i == CL_DESCR)
     {
-      dprint (5, (debugfile, "load_charset: Got character description: < %s > -> %x\n",
+      dprint (5, (debugfile, "load_charset: Got character description: <%s> -> %x\n",
                   cd->symbol, cd->repr));
-      hash_delete (cs->symb_to_repr, cd->symbol, NULL, NULL);
-      hash_insert (cs->symb_to_repr, cd->symbol, cd, 0);
 
       if (!multbyte)
@@ -430 +429 @@
         if (0 <= cd->repr && cd->repr < 256)
         {
+          hash_delete (cs->symb_to_repr, cd->symbol, NULL, NULL);
+          hash_insert (cs->symb_to_repr, cd->symbol, cd, 0);
+
           if (cs->description[cd->repr])
+          {
+            hash_delete (cs->symb_to_repr, cs->description[cd->repr]->symbol, cs->description[cd->repr], NULL);
             chardesc_free (&cs->description[cd->repr]);
+          }
           else
             cs->u_symb++;
@@ -451 +456 @@
           cs->n_symb = new_size;
         }
-
+        hash_delete (cs->symb_to_repr, cd->symbol, NULL, NULL);
+        hash_insert (cs->symb_to_repr, cd->symbol, cd, 0);
         cs->description[cs->u_symb++] = cd;
         cd = NULL;
       }
     }
-
+    if (cd)
+    {
+      dprint (5, (debugfile, "load_charset: character description still present: <%s>->%x\n",
+                  cd->symbol, cd->repr));
+    }
     chardesc_free (&cd);
   }
@@ -477 +487 @@
 static CHARDESC *repr2descr (int repr, CHARSET * cs)
 {
-  CHARDESC key;
-
+  CHARDESC *key;
+  CHARDESC **r;
+  
   if (!cs || repr < 0)
     return NULL;
@@ -490 +501 @@
   }
 
-  key.repr = repr;
-  return bsearch (&key, cs->description, cs->u_symb,
-                  sizeof (CHARDESC *), _cd_compar);
+  key = safe_malloc (sizeof(CHARDESC));
+  key->repr = repr;
+  key->symbol = "<unknown>"; /* otherwise, the
+                             * debug code may 
+                             * segfault. ouch.
+                             */
+
+  r = bsearch (&key, cs->description, cs->u_symb,
+               sizeof (CHARDESC *), _cd_compar);
+
+  safe_free ((void **) &key);
+
+  if (r) return *r;
+  
+  return NULL;
 }
 
@@ -833 +856 @@
 static struct utf8_state *new_utf8_state (void)
 {
-  return safe_calloc (sizeof (struct utf8_state), 1);
+  return safe_calloc (1, sizeof (struct utf8_state));
 }
 
@@ -879 +902 @@
     {
       sfu->blen = (sfu->blen + 80) * 2;
-      safe_realloc((void **) &sfu->buffer, sfu->blen);
+      safe_realloc((void **) &sfu->buffer, sfu->blen + 1);
     }
     sfu->buffer[sfu->bp++] = u;
@@ -889 +912 @@
 DECODER *mutt_open_decoder (STATE *s, BODY *b, int istext)
 {
-  DECODER *dp = safe_calloc (sizeof (DECODER), 1);
+  DECODER *dp = safe_calloc (1, sizeof (DECODER));
   
   dp->s = s;
@@ -931 +954 @@
     state_prefix_putc (mutt_display_char ((unsigned char) c, dp->map), dp->s);
 }
+
+/* FIXME: utf-8 support */
+
+int mutt_recode_file (const char *fname, const char *src, const char *dest)
+{
+  FILE *fp, *tmpfp;
+  char tempfile[_POSIX_PATH_MAX];
+  int c;
+  int rv = -1;
+  
+  CHARSET_MAP *map;
+
+  if (mutt_is_utf8 (dest) ^ mutt_is_utf8(src))
+  {
+    mutt_error (_("We can't currently handle utf-8 at this point."));
+    return -1;
+  }
+
+  if ((fp = fopen (fname, "r+")) == NULL)
+  {
+    mutt_error (_("Can't open %s: %s."), fname, strerror (errno));
+    return -1;
+  }
+  
+  mutt_mktemp (tempfile);
+  if ((tmpfp = safe_fopen (tempfile, "w+")) == NULL)
+  {
+    mutt_error (_("Can't open %s: %s."), tempfile, strerror (errno));
+    fclose (fp);
+    return -1;
+  }
+
+  map = mutt_get_translation (src, dest);
+  
+  while ((c = fgetc (fp)) != EOF)
+    if (fputc (mutt_display_char ((unsigned char) c, map), tmpfp) == EOF)
+      goto bail;
+
+  fclose (fp); fp = NULL;
+  rewind (tmpfp);
+
+  /* don't use safe_fopen here - we're just going
+   * to overwrite the old file.
+   */
+
+  if ((fp = fopen (fname, "w")) == NULL)
+    goto bail;
+  
+  while ((c = fgetc (tmpfp)) != EOF)
+    if (fputc (c, fp) == EOF)
+      goto bail;
+
+  rv = 0;
+  unlink (tempfile);
+  
+bail:
+  if (rv == -1)
+    mutt_error (_("Error while recoding %s. See %s for recovering your data."),
+                fname, tempfile);
+
+  if (fp) fclose (fp);
+  if (tmpfp) fclose (tmpfp);
+  return rv;
+}