minor utility tweaks

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2240 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index f54e253867a8df0a6455867df02a3a001d9b9fec..f440a72d18009a35cef2c462a720d8e07d44dadd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -141,6 +141,13 @@ CVS code -
        - Try to automatically detect whether UTF-8 support is needed by
          setting the NO_UTF8 flag if setlocale() returns a string that
          doesn't contain "UTF-8". (DLR)
+- utils.c:
+  regexec_safe()
+       - Remove redundant regexec #define, and move the regexec #undef
+         to nano.h. (DLR)
+  is_blank_char()
+       - Rewrite to use ctype functions instead of checking directly
+         for spaces and tabs. (DLR)
 - winio.c:
   titlebar()
        - Rename some variables for consistency, make space an int

diff --git a/src/nano.h b/src/nano.h
index ca9d37ba0b33b5ac2fe8fc6a00dbde4f61e670db..95ff80edfa106f69980dd918f4fdbb9d2b5c05bc 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -47,6 +47,7 @@
 #define charcpy(dest, src, n) memcpy(dest, src, (n) * sizeof(char))
 
 #ifdef BROKEN_REGEXEC
+#undef regexec
 #define regexec(preg, string, nmatch, pmatch, eflags) regexec_safe(preg, string, nmatch, pmatch, eflags)
 #endif
 

diff --git a/src/utils.c b/src/utils.c
index 8fd711869af0dda57075f9adc757ee6e2064c705..4b3c918b44fa64aba31d1953eafffc0b8ad782c8 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -39,7 +39,6 @@
 
 #ifdef HAVE_REGEX_H
 #ifdef BROKEN_REGEXEC
-#undef regexec
 int regexec_safe(const regex_t *preg, const char *string, size_t nmatch,
        regmatch_t pmatch[], int eflags)
 {
@@ -47,8 +46,7 @@ int regexec_safe(const regex_t *preg, const char *string, size_t nmatch,
        return regexec(preg, string, nmatch, pmatch, eflags);
     return REG_NOMATCH;
 }
-#define regexec(preg, string, nmatch, pmatch, eflags) regexec_safe(preg, string, nmatch, pmatch, eflags)
-#endif /* BROKEN_REGEXEC */
+#endif
 
 int regexp_bol_or_eol(const regex_t *preg, const char *string)
 {
@@ -62,7 +60,7 @@ int regexp_bol_or_eol(const regex_t *preg, const char *string)
 /* This function is equivalent to isblank(). */
 int is_blank_char(int c)
 {
-    return (c == '\t' || c == ' ');
+    return isspace(c) && (!is_cntrl_char(c) || c == '\t');
 }
 #endif