Add isblank() function for systems without it. Needed for POSIX

character class matching in fnmatch.c and glob.c.

diff --git a/Makefile.in b/Makefile.in
index ccd7f2981ffe318375270744880577f6fe96d389..106bc13cd2b4faa2b779c62e97f9bebef32626e9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,11 +105,11 @@ PROGS = @PROGS@
 SRCS = aix.c alias.c alloc.c check.c closefrom.c def_data.c defaults.c env.c \
        error.c fileops.c find_path.c fnmatch.c getcwd.c getprogname.c \
        getspwuid.c gettime.c glob.c goodpath.c gram.c gram.y interfaces.c \
-       lbuf.c ldap.c list.c logging.c match.c mkstemp.c memrchr.c parse.c \
-       pwutil.c  set_perms.c sigaction.c snprintf.c strcasecmp.c strerror.c \
-       strlcat.c strlcpy.c sudo.c sudo_noexec.c sudo_edit.c sudo_nss.c \
-       testsudoers.c tgetpass.c toke.c toke.l tsgetgrpw.c utimes.c visudo.c \
-       zero_bytes.c redblack.c selinux.c sesh.c $(AUTH_SRCS)
+       isblank.c lbuf.c ldap.c list.c logging.c match.c mkstemp.c memrchr.c \
+       parse.c pwutil.c  set_perms.c sigaction.c snprintf.c strcasecmp.c \
+       strerror.c strlcat.c strlcpy.c sudo.c sudo_noexec.c sudo_edit.c \
+       sudo_nss.c testsudoers.c tgetpass.c toke.c toke.l tsgetgrpw.c utimes.c \
+       visudo.c zero_bytes.c redblack.c selinux.c sesh.c $(AUTH_SRCS)
 
 AUTH_SRCS = auth/afs.c auth/aix_auth.c auth/bsdauth.c auth/dce.c auth/fwtk.c \
            auth/kerb4.c auth/kerb5.c auth/pam.c auth/passwd.c auth/rfc1938.c \
@@ -258,6 +258,8 @@ gram.o: $(devdir)/gram.c $(SUDODEP) $(srcdir)/parse.h $(srcdir)/list.h $(devdir)
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(devdir)/gram.c
 interfaces.o: $(srcdir)/interfaces.c $(SUDODEP) $(srcdir)/interfaces.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/interfaces.c
+isblank.o: $(srcdir)/isblank.c $(srcdir)/compat.h config.h
+       $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/isblank.c
 lbuf.o: $(srcdir)/lbuf.c $(SUDODEP)
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/lbuf.c
 ldap.o: $(srcdir)/ldap.c $(SUDODEP) $(srcdir)/parse.h $(srcdir)/list.h

diff --git a/aclocal.m4 b/aclocal.m4
index 136d870431015e996ffcd595c58d5f06f4d7e6b7..13089f0901268a802c7fd02a01af47ba7e052c23 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -225,6 +225,8 @@ AC_DEFUN([SUDO_FUNC_ISBLANK],
 ] [
   if test "$sudo_cv_func_isblank" = "yes"; then
     AC_DEFINE(HAVE_ISBLANK, 1, [Define if you have isblank(3).])
+  else
+    AC_LIBOBJ(isblank)
   fi
 ])
 

diff --git a/compat.h b/compat.h
index d7a45cbd3cb377cdda4fd97d4b070b0da6fbe2cd..ae42b0f31ad3a6da560136ddd01f3852b00f7543 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -152,9 +152,10 @@
 #endif
 
 /*
- * Simple isblank() macro for systems without it.
+ * Simple isblank() macro and function for systems without it.
  */
 #ifndef HAVE_ISBLANK
+int isblank __P((int));
 # define isblank(_x)   ((_x) == ' ' || (_x) == '\t')
 #endif
 

diff --git a/configure b/configure
index 9ff25ea35eaa6afdb97b300c09276fd5f8e3ab6d..f6384086e9c1af997e8bdf952ccf2eb1c8b10b5f 100755 (executable)
--- a/configure
+++ b/configure
@@ -17250,6 +17250,13 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_ISBLANK 1
 _ACEOF
 
+  else
+    case " $LIBOBJS " in
+  *" isblank.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS isblank.$ac_objext"
+ ;;
+esac
+
   fi