[ViewVC] Diff of: cvs/rxvt-unicode/src/misc.C

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.49 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.53 by root, Sun Apr 26 01:59:53 2009 UTC

   while (len--)
     {
       ssize_t l = wcrtomb (dst, *str++, mbs);
       if (l < 0)
+        {
-        *dst++ = '?';
+          *dst++ = '?';
+          wcrtomb (0, 0, mbs); // reset undefined state
+        }
       else
         dst += l;
     }
   *dst++ = 0;
   *p = 0;
   return r;
 }
-char *
+const char *
 rxvt_basename (const char *str) NOTHROW
 {
   char *base = strrchr (str, '/');
   return (char *) (base ? base + 1 : str);
   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);
+      memcpy (ret[l], s, p);
       ret[l][p] = '\0';
       rxvt_strtrim (ret[l]);
       s = ++t;
     }
     free (cs[i]);
   free (cs);
 }
+void *
+rxvt_malloc (size_t size)
+{
+  void *p = malloc (size);
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
+  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;
+}

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines