--- rxvt-unicode/src/misc.C	2007/09/08 21:25:56	1.46
+++ rxvt-unicode/src/misc.C	2011/01/10 14:07:19	1.55
@@ -40,7 +40,10 @@
       ssize_t l = wcrtomb (dst, *str++, mbs);
 
       if (l < 0)
-        *dst++ = '?';
+        {
+          *dst++ = '?';
+          wcrtomb (0, 0, mbs); // reset undefined state
+        }
       else
         dst += l;
     }
@@ -81,7 +84,7 @@
         *p++ = 0xc0 | ( w >>  6),
         *p++ = 0x80 | ( w        & 0x3f);
       else if (w < 0x010000)
-        *p++ = 0xe0 | ( w >> 12       ),
+        *p++ = 0xe0 | ( w >> 12),
         *p++ = 0x80 | ((w >>  6) & 0x3f),
         *p++ = 0x80 | ( w        & 0x3f);
       else if (w < 0x110000)
@@ -118,7 +121,7 @@
       else if (s[0] < 0x80)
         *p++ = *s++;
       else if (len >= 2
-               && s[0] >= 0xc2 && s[0] <= 0xdf 
+               && s[0] >= 0xc2 && s[0] <= 0xdf
                && (s[1] & 0xc0) == 0x80)
         {
           *p++ = ((s[0] & 0x1f) << 6)
@@ -146,9 +149,9 @@
                && (s[2] & 0xc0) == 0x80
                && (s[3] & 0xc0) == 0x80)
         {
-          *p++ = ((s[0] & 0x07) << 18) 
-               | ((s[1] & 0x3f) << 12) 
-               | ((s[2] & 0x3f) <<  6) 
+          *p++ = ((s[0] & 0x07) << 18)
+               | ((s[1] & 0x3f) << 12)
+               | ((s[2] & 0x3f) <<  6)
                |  (s[3] & 0x3f);
           s += 4;
         }
@@ -164,12 +167,12 @@
   return r;
 }
 
-char *
+const char *
 rxvt_basename (const char *str) NOTHROW
 {
-  char *base = strrchr (str, '/');
+  const char *base = strrchr (str, '/');
 
-  return (char *) (base ? base + 1 : str);
+  return base ? base + 1 : str;
 }
 
 /*
@@ -237,7 +240,7 @@
 /*
  * remove leading/trailing space in place.
  */
-char           *
+char *
 rxvt_strtrim (char *str) NOTHROW
 {
   char *r, *s;
@@ -262,22 +265,20 @@
 }
 
 /*
- * Split a comma-separated string into an array, stripping leading and
+ * Split a string into an array based on the given delimiter, stripping leading and
  * trailing spaces from each entry.  Empty strings are properly returned
- * Caller should free each entry and array when done
  */
-char          **
-rxvt_splitcommastring (const char *cs) NOTHROW
+char **
+rxvt_strsplit (char delim, const char *str) NOTHROW
 {
-  int             l, n, p;
-  const char     *s, *t;
-  char          **ret;
+  int l, n;
+  char *s, *t;
+  char **ret;
 
-  if ((s = cs) == NULL)
-    s = "";
+  s = strdup (str ? str : "");
 
   for (n = 1, t = s; *t; t++)
-    if (*t == ',')
+    if (*t == delim)
       n++;
 
   ret = (char **)malloc ((n + 1) * sizeof (char *));
@@ -285,11 +286,10 @@
 
   for (l = 0, t = s; l < n; l++)
     {
-      for ( ; *t && *t != ','; t++) ;
-      p = t - s;
-      ret[l] = (char *)malloc (p + 1);
-      strncpy (ret[l], s, p);
-      ret[l][p] = '\0';
+      for (; *t && *t != delim; t++)
+        ;
+      *t = '\0';
+      ret[l] = s;
       rxvt_strtrim (ret[l]);
       s = ++t;
     }
@@ -297,14 +297,35 @@
   return ret;
 }
 
-void
-rxvt_freecommastring (char **cs) NOTHROW
+void *
+rxvt_malloc (size_t size)
 {
-  for (int i = 0; cs[i]; ++i)
-    free (cs[i]);
+  void *p = malloc (size);
+
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
 
-  free (cs);
+  return p;
 }
 
+void *
+rxvt_calloc (size_t number, size_t size)
+{
+  void *p = calloc (number, size);
 
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
 
+  return p;
+}
+
+void *
+rxvt_realloc (void *ptr, size_t size)
+{
+  void *p = realloc (ptr, size);
+
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
+
+  return p;
+}