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

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.42 by ayin, Mon Aug 27 20:00:26 2007 UTC vs.
Revision 1.57 by root, Thu May 22 18:54:33 2014 UTC

  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1996      mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   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++ = w;
       else if (w < 0x000800)
         *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)
         *p++ = 0xf0 | ( w >> 18),
         *p++ = 0x80 | ((w >> 12) & 0x3f),
       if (len == 0)
         break;
       else if (s[0] < 0x80)
         *p++ = *s++;
       else if (len >= 2
                && s[0] >= 0xc2 && s[0] <= 0xdf
                && (s[1] & 0xc0) == 0x80)
         {
           *p++ = ((s[0] & 0x1f) << 6)
                |  (s[1] & 0x3f);
           s += 2;
                    || (s[0] == 0xf4                 && s[1] >= 0x80 && s[1] <= 0x8f)
                   )
                && (s[2] & 0xc0) == 0x80
                && (s[3] & 0xc0) == 0x80)
         {
           *p++ = ((s[0] & 0x07) << 18)
                | ((s[1] & 0x3f) << 12)
                | ((s[2] & 0x3f) <<  6)
                |  (s[3] & 0x3f);
           s += 4;
         }
       else
         {
   *p = 0;
   return r;
 }
-char *
+const char *
-rxvt_r_basename (const char *str) NOTHROW
+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
  */
   static class rxvt_failure_exception rxvt_failure_exception;
   throw (rxvt_failure_exception);
 }
 /*
- * check that the first characters of S1 match S2
+ * remove leading/trailing space in place.
- *
- * No Match
- *      return: 0
- * Match
- *      return: strlen (S2)
  */
-int
+char *
-rxvt_Str_match (const char *s1, const char *s2) NOTHROW
-{
-  int n = strlen (s2);
-  return ((strncmp (s1, s2, n) == 0) ? n : 0);
-}
-/*
- * remove leading/trailing space and strip-off leading/trailing quotes.
- * in place.
- */
-char           *
-rxvt_Str_trim (char *str) NOTHROW
+rxvt_strtrim (char *str) NOTHROW
 {
   char *r, *s;
   if (!str || !*str)		/* shortcut */
     return str;
   /* dump return and other trailing whitespace */
   while (r > s && isspace (*r))
     r--;
-#if 0
-  /* skip matching leading/trailing quotes */
-  if (*s == '"' && *r == '"' && n > 1)
-    {
-      s++;
-      n -= 2;
-    }
-#endif
   memmove (str, s, r + 1 - s);
   str[r + 1 - s] = 0;
   return str;
 }
 /*
- * in-place interpretation of string:
+ * Split a string into an array based on the given delimiter, stripping leading and
- *
+ * trailing spaces from each entry.  Empty strings are properly returned
- *      backslash-escaped:      "\a\b\E\e\n\r\t", "\octal"
- *      Ctrl chars:     ^@ .. ^_, ^?
- *
- *      Emacs-style:    "M-" prefix
- *
- * Also,
- *      "M-x" prefixed strings, append "\r" if needed
- *      "\E]" prefixed strings (XTerm escape sequence) append ST if needed
- *
- * returns the converted string length
  */
-int
+char **
-rxvt_Str_escaped (char *str) NOTHROW
+rxvt_strsplit (char delim, const char *str) NOTHROW
 {
-  char            ch, *s, *d;
+  int l, n;
-  int             i, num, append = 0;
+  char *s, *t;
+  char **ret;
-  if (!str || !*str)
+  s = strdup (str ? str : "");
-    return 0;
-  d = s = str;
-  if (*s == 'M' && s[1] == '-')
-    {
-      /* Emacs convenience, replace leading `M-..' with `\E..' */
-      *d++ = C0_ESC;
-      s += 2;
-      if (toupper (*s) == 'X')
-        /* append carriage-return for `M-xcommand' */
-        for (*d++ = 'x', append = '\r', s++; isspace (*s); s++) ;
-    }
-  for (; (ch = *s++);)
-    {
-      if (ch == '\\')
-        {
-          ch = *s++;
-          if (ch >= '0' && ch <= '7')
-            {	/* octal */
-              num = ch - '0';
-              for (i = 0; i < 2; i++, s++)
-                {
-                  ch = *s;
-                  if (ch < '0' || ch > '7')
-                    break;
-                  num = num * 8 + ch - '0';
-                }
-              ch = (char)num;
-            }
-          else if (ch == 'a')
-            ch = C0_BEL;	/* bell */
-          else if (ch == 'b')
-            ch = C0_BS;	/* backspace */
-          else if (ch == 'E' || ch == 'e')
-            ch = C0_ESC;	/* escape */
-          else if (ch == 'n')
-            ch = '\n';	/* newline */
-          else if (ch == 'r')
-            ch = '\r';	/* carriage-return */
-          else if (ch == 't')
-            ch = C0_HT;	/* tab */
-        }
-      else if (ch == '^')
-        {
-          ch = *s++;
-          ch = toupper (ch);
-          ch = (ch == '?' ? 127 : (ch - '@'));
-        }
-      *d++ = ch;
-    }
-  /* ESC] is an XTerm escape sequence, must be terminated */
-  if (*str == '\0' && str[1] == C0_ESC && str[2] == ']')
-    append = CHAR_ST;
-  /* add trailing character as required */
-  if (append && d[-1] != append)
-    *d++ = append;
-  *d = '\0';
-  return (d - str);
-}
-/*
- * Split a comma-separated string into an array, 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
-{
-  int             l, n, p;
-  const char     *s, *t;
-  char          **ret;
-  if ((s = cs) == NULL)
-    s = "";
   for (n = 1, t = s; *t; t++)
-    if (*t == ',')
+    if (*t == delim)
       n++;
   ret = (char **)malloc ((n + 1) * sizeof (char *));
   ret[n] = NULL;
   for (l = 0, t = s; l < n; l++)
     {
-      for ( ; *t && *t != ','; t++) ;
+      for (; *t && *t != delim; t++)
-      p = t - s;
+        ;
-      ret[l] = (char *)malloc (p + 1);
+      *t = '\0';
-      strncpy (ret[l], s, p);
-      ret[l][p] = '\0';
+      ret[l] = s;
-      rxvt_Str_trim (ret[l]);
+      rxvt_strtrim (ret[l]);
       s = ++t;
     }
   return ret;
 }
-void
+void *
-rxvt_freecommastring (char **cs) NOTHROW
+rxvt_malloc (size_t size)
 {
-  for (int i = 0; cs[i]; ++i)
+  void *p = malloc (size);
-    free (cs[i]);
-  free (cs);
+  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;
+}

Diff Legend

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

Comparing rxvt-unicode/src/misc.C (file contents): Revision 1.42 by ayin, Mon Aug 27 20:00:26 2007 UTC vs. Revision 1.57 by root, Thu May 22 18:54:33 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.42 by ayin, Mon Aug 27 20:00:26 2007 UTC vs.
Revision 1.57 by root, Thu May 22 18:54:33 2014 UTC