diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-09-24 10:59:01 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-09-24 11:00:44 +0200 |
| commit | 6a14f1c2502f58ff7bed8cb451f95a83f5ee920a (patch) | |
| tree | 975cb6488e6413dab5aece9fcf1aee5a595381ac /fish | |
| parent | 0ca36888c6975ffa7e03df11bf8ded42156939c7 (diff) | |
| download | libguestfs-6a14f1c2502f58ff7bed8cb451f95a83f5ee920a.tar.gz libguestfs-6a14f1c2502f58ff7bed8cb451f95a83f5ee920a.tar.xz libguestfs-6a14f1c2502f58ff7bed8cb451f95a83f5ee920a.zip | |
avoid use of all ctype macros
* cfg.mk (disable_temporarily): Don't disable sc_avoid_ctype_macros.
* fish/tilde.c: Remove unnecessary inclusion of ctype.h.
* bootstrap: Add gnulib's c-ctype module to the list.
* daemon/m4/gnulib-cache.m4: Likewise.
* daemon/ext2.c: Include "c-ctype.h", not <ctype.h>.
Use c_isspace, etc, rather than isspace.
* daemon/guestfsd.c: Likewise.
* daemon/lvm.c: Likewise.
* daemon/proto.c: Likewise.
* fish/fish.c: Likewise.
* fish/tilde.c: Likewise.
* src/generator.ml: Likewise.
* src/guestfs.c: Likewise.
* examples/to-xml.c: Likewise.
* examples/Makefile.am (to_xml_CPPFLAGS): Add -I$(top_srcdir)/gnulib/lib
so inclusion of "c-ctype.h" works.
(to_xml_CPPFLAGS): Rename from to_xml_CFLAGS.
Diffstat (limited to 'fish')
| -rw-r--r-- | fish/fish.c | 6 | ||||
| -rw-r--r-- | fish/tilde.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fish/fish.c b/fish/fish.c index f8c04836..3300536d 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -26,7 +26,6 @@ #include <getopt.h> #include <signal.h> #include <assert.h> -#include <ctype.h> #include <sys/types.h> #include <sys/wait.h> @@ -38,6 +37,7 @@ #include <guestfs.h> #include "fish.h" +#include "c-ctype.h" #include "closeout.h" #include "progname.h" @@ -579,7 +579,7 @@ script (int prompt) /* Skip any initial whitespace before the command. */ again: - while (*buf && isspace (*buf)) + while (*buf && c_isspace (*buf)) buf++; if (!*buf) continue; @@ -1127,7 +1127,7 @@ parse_string_list (const char *str) * as separate fragments because we can't just copy it: we have to remove * the \. */ - while (*p && (!isblank (*p) || in_quote)) { + while (*p && (!c_isblank (*p) || in_quote)) { const char *end = p; /* Check if the fragment starts with a quote */ diff --git a/fish/tilde.c b/fish/tilde.c index 40854178..1c52d3ed 100644 --- a/fish/tilde.c +++ b/fish/tilde.c @@ -22,7 +22,6 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <ctype.h> #include <assert.h> #include <pwd.h> #include <sys/types.h> |