Use c-ctype.h in lib-src

This fixes some unlikely bugs and removes the temptation
of using ctype.h.  Although some uses were correct,
many weren't.
* lib-src/ebrowse.c: Include c-ctype.h, not ctype.h.
* lib-src/emacsclient.c: Include c-ctype.h, not ctype.h.
* lib-src/update-game-score.c: Include c-ctype.h, not ctype.h.
All uses changed.

(cherry picked from commit 865b54e2acea4fdaa3f302ed225f50281b371d6e)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 8e64f1e92d3e6508304efd26c1aee3f589faae41..c1ffa1480ecd21cc4a16e97b97aa7067f4cc55c0 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -68,7 +68,6 @@ char *w32_getenv (const char *);
 
 #define DEFAULT_TIMEOUT (30)
 
-#include <ctype.h>
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>
@@ -83,6 +82,7 @@ char *w32_getenv (const char *);
 #include <unistd.h>
 
 #include <attribute.h>
+#include <c-ctype.h>
 #include <filename.h>
 #include <intprops.h>
 #include <min-max.h>
@@ -2124,7 +2124,7 @@ main (int argc, char **argv)
              unsigned char c;
              do
                c = *++p;
-             while (isdigit (c) || c == ':');
+             while (c_isdigit (c) || c == ':');
 
              if (c == 0)
                 {
@@ -2136,7 +2136,7 @@ main (int argc, char **argv)
             }
 #ifdef WINDOWSNT
          else if (! IS_ABSOLUTE_FILE_NAME (argv[i])
-                  && (isalpha (argv[i][0]) && argv[i][1] == ':'))
+                  && (c_isalpha (argv[i][0]) && argv[i][1] == ':'))
            /* Windows can have a different default directory for each
               drive, so the cwd passed via "-dir" is not sufficient
               to account for that.

diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index e3b24ad77170d0717fd11ca9080c3c1997b98990..7545d0390c144ae24121e018f089c7a2c9ef1fef 100644 (file)
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -41,11 +41,11 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <stdlib.h>
 #include <time.h>
 #include <pwd.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <getopt.h>
 
+#include <c-ctype.h>
 #include <unlocked-io.h>
 
 #ifdef WINDOWSNT
@@ -143,7 +143,7 @@ normalize_integer (char *num)
 {
   bool neg;
   char *p;
-  while (*num != '\n' && isspace (*num))
+  while (*num != '\n' && c_isspace (*num))
     num++;
   neg = *num == '-';
   num += neg || *num == '-';