Changeset 5375:132474d6dd3b for alias.c

Timestamp:

2008-05-15 08:29:04 (6 months ago)

Author:

Rocco Rutte <pdmef@…>

Branch:

HEAD

Message:

Make mutt_check_alias_name() multibyte-aware (closes #2403).

Files:

• alias.c (modified) (5 diffs)

alias.c

@@ -215 +215 @@
 {
   ALIAS *new, *t;
-  char buf[LONG_STRING], prompt[SHORT_STRING], *pc;
+  char buf[LONG_STRING], tmp[LONG_STRING], prompt[SHORT_STRING], *pc;
   char *err = NULL;
   char fixed[LONG_STRING];
@@ -232 +232 @@
   if (adr && adr->mailbox)
   {
-    strfcpy (buf, adr->mailbox, sizeof (buf));
-    if ((pc = strchr (buf, '@')))
+    strfcpy (tmp, adr->mailbox, sizeof (tmp));
+    if ((pc = strchr (tmp, '@')))
       *pc = 0;
   }
   else
-    buf[0] = '\0';
+    tmp[0] = '\0';
 
   /* Don't suggest a bad alias name in the event of a strange local part. */
-  mutt_check_alias_name (buf, buf);
+  mutt_check_alias_name (tmp, buf, sizeof (buf));
   
 retry_name:
@@ -254 +254 @@
   }
   
-  if (mutt_check_alias_name (buf, fixed))
+  if (mutt_check_alias_name (buf, fixed, sizeof (fixed)))
   {
     switch (mutt_yesorno (_("Warning: This alias name may not work.  Fix it?"), M_YES))
@@ -352 +352 @@
     }
 
-    if (mutt_check_alias_name (new->name, NULL))
+    if (mutt_check_alias_name (new->name, NULL, 0))
       mutt_quote_filename (buf, sizeof (buf), new->name);
     else
@@ -380 +380 @@
  */
 
-static int check_alias_name_char (char c)
-{
-  return (c == '-' || c == '_' || c == '+' || c == '=' || c == '.' ||
-          isalnum ((unsigned char) c));
-}
-
-int mutt_check_alias_name (const char *s, char *d)
-{
-  int rv = 0;
-  for (; *s; s++) 
-  {
-    if (!check_alias_name_char (*s))
-    {
-      if (!d)
+int mutt_check_alias_name (const char *s, char *dest, size_t destlen)
+{
+  wchar_t wc;
+  mbstate_t mb;
+  size_t l;
+  int rv = 0, bad = 0, dry = !dest || !destlen;
+
+  memset (&mb, 0, sizeof (mbstate_t));
+
+  if (!dry)
+    destlen--;
+  for (; s && *s && (dry || destlen) &&
+       (l = mbrtowc (&wc, s, MB_CUR_MAX, &mb)) != 0;
+       s += l, destlen -= l)
+  {
+    bad = l == (size_t)(-1) || l == (size_t)(-2); /* conversion error */
+    bad = bad || (!dry && l > destlen);         /* too few room for mb char */
+    if (l == 1)
+      bad = bad || (strchr ("-_+=.", *s) == NULL && !iswalnum (wc));
+    else
+      bad = bad || !iswalnum (wc);
+    if (bad)
+    {
+      if (dry)
         return -1;
-      else
-      {
-        *d++ = '_';
-        rv = -1;
-      }
-    }
-    else if (d)
-      *d++ = *s;
-  }
-  if (d)
-    *d++ = *s;
+      *dest++ = '_';
+      rv = -1;
+    }
+    else if (!dry)
+    {
+      memcpy (dest, s, l);
+      dest += l;
+    }
+  }
+  if (!dry)
+    *dest = 0;
   return rv;
 }