Changeset 738 for branches

Timestamp:

05/30/06 21:45:47 (6 years ago)

Author:

wd

Message:

Fix color stripping to properly handle the single digit foreground color
case.

File:

• branches/ithildin-1.1/modules/ircd/addons/cmode_strip.c (modified) (2 diffs)

branches/ithildin-1.1/modules/ircd/addons/cmode_strip.c

@@ -60 +60 @@
 }
 
-#define ANSI_CHAR        '\033'
-#define BLINK_CHAR        '\006'
-#define BOLD_CHAR        '\002'
-#define COLOR_CHAR        '\003'
-#define INVERSE_CHAR        '\026'
-#define UNDERLINE_CHAR        '\037'
+#define ANSI_CHAR       '\033'
+#define BLINK_CHAR      '\006'
+#define BOLD_CHAR       '\002'
+#define COLOR_CHAR      '\003'
+#define INVERSE_CHAR    '\026'
+#define UNDERLINE_CHAR  '\037'
 
 HOOK_FUNCTION(strip_conf_hook) {
@@ -117 +117 @@
 
     if (chanmode_isset(ccap->chan, chanmode_strip)) {
-        char *from, *to;
-        from = to = ccap->extra;
+        unsigned char *from, *to;
+        from = to = (unsigned char *)ccap->extra;
 
         while (*from != '\0') {
-            if (strip_chars[(unsigned char)*from]) {
+            if (strip_chars[*from]) {
+                /* We will always skip the character here, it just may not
+                 * match COLOR_CHAR in which case we simply continue on */
                 if (*from++ == COLOR_CHAR) {
                     if (isdigit(*from)) {
-                        if (isdigit(*++from)) {
-                            if (*++from == ',') {
-                                if (isdigit(*++from)) {
-                                    if (isdigit(*from))
-                                        from++;
-                                }
-                            }
+                        if (isdigit(*++from))
+                            from++; /* skip second digit which is optional */
+
+                        if (*from == ',' && isdigit(*(from + 1))) {
+                            /* background color specified ... */
+                            from += 2;
+                            if (isdigit(*from))
+                                from++;
                         }
                     }
                 }
-                continue;
-            }
-            *to++ = *from++;
+            } else
+                *to++ = *from++;
         }
     }