X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=regex.c;h=586ad2bd19b3ddcd72be44872ac421f4f4f09114;hp=8f6f2acff6d92a67b77812ba0e261f342f8a3b1b;hb=eab91d9d0c0f1dc1c5ac310dfe02259011c13fcd;hpb=420f3633557ed75a0de989eb065af6e09eed29ba

diff --git a/regex.c b/regex.c
index 8f6f2ac..586ad2b 100644
--- a/regex.c
+++ b/regex.c
@@ -168,7 +168,7 @@ extern char *re_syntax_table;
 
 static char re_syntax_table[CHAR_SET_SIZE];
 
-enum { MUTT_ALNUM, MUTT_ALPHA, MUTT_BLANK, MUTT_CNTRL, MUTT_DIGIT, MUTT_GRAPH,
+enum { MUTT_ALNUM = 1, MUTT_ALPHA, MUTT_BLANK, MUTT_CNTRL, MUTT_DIGIT, MUTT_GRAPH,
        MUTT_LOWER, MUTT_PRINT, MUTT_PUNCT, MUTT_SPACE, MUTT_UPPER, MUTT_XDIGIT,
        MUTT_INVALID
      };
@@ -202,26 +202,6 @@ static int ctype(const char *name)
   return MUTT_INVALID;
 }
 
-#ifndef HAVE_ISCTYPE
-static int isctype(char c, int desc)
-{
-  switch (desc) {
-    case MUTT_ALNUM: return isalnum(c);
-    case MUTT_ALPHA: return isalpha(c);
-    case MUTT_BLANK: return isblank(c);
-    case MUTT_CNTRL: return iscntrl(c);
-    case MUTT_DIGIT: return isdigit(c);
-    case MUTT_GRAPH: return isgraph(c);
-    case MUTT_LOWER: return islower(c);
-    case MUTT_PRINT: return isprint(c);
-    case MUTT_PUNCT: return ispunct(c);
-    case MUTT_SPACE: return isspace(c);
-    case MUTT_UPPER: return isupper(c);
-    case MUTT_XDIGIT: return isxdigit(c);
-  }
-  return 0; /* false */
-}
-#endif
 
 static void
 init_syntax_once ()
@@ -1861,6 +1841,27 @@ static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type
 #define FREE_STACK_RETURN(value)                \
   return (free (compile_stack.stack), value)                /* __MEM_CHECKED__ */
 
+#ifndef HAVE_ISCTYPE
+static int isctype(char c, int desc)
+{
+  switch (desc) {
+    case MUTT_ALNUM: return ISALNUM(c);
+    case MUTT_ALPHA: return ISALPHA(c);
+    case MUTT_BLANK: return ISBLANK(c);
+    case MUTT_CNTRL: return ISCNTRL(c);
+    case MUTT_DIGIT: return ISDIGIT(c);
+    case MUTT_GRAPH: return ISGRAPH(c);
+    case MUTT_LOWER: return ISLOWER(c);
+    case MUTT_PRINT: return ISPRINT(c);
+    case MUTT_PUNCT: return ISPUNCT(c);
+    case MUTT_SPACE: return ISSPACE(c);
+    case MUTT_UPPER: return ISUPPER(c);
+    case MUTT_XDIGIT: return ISXDIGIT(c);
+  }
+  return 0; /* false */
+}
+#endif
+
 static reg_errcode_t
 regex_compile (pattern, size, syntax, bufp)
      const char *pattern;