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

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.50 by ayin, Tue Dec 18 01:36:24 2007 UTC vs.
Revision 1.54 by root, Sat May 30 06:56:20 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, '/');
+  const char *base = strrchr (str, '/');
-  return (char *) (base ? base + 1 : str);
+  return base ? base + 1 : str;
 }
 /*
  * Print an error message
  */
   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;
     }

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