diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-17 01:15:38 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-17 01:15:38 +0000 |
commit | 45b14dbddc244bba8c17d71186c2bc49b355636a (patch) | |
tree | 379b4872dcd775fc18feff237342aa331d63031a | |
parent | 7bb8b49596156b85df403d09c2195e2533ec372c (diff) |
- Check for gl_matchc support in glob_t and fall back to the
openbsd-compat/glob.[ch] support if it does not exist.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.in | 20 | ||||
-rw-r--r-- | includes.h | 3 | ||||
-rw-r--r-- | openbsd-compat/glob.c | 6 | ||||
-rw-r--r-- | openbsd-compat/glob.h | 6 |
6 files changed, 36 insertions, 8 deletions
@@ -22,6 +22,8 @@ [auth-options.c channels.c channels.h serverloop.c session.c] implement "permitopen" key option, restricts -L style forwarding to to specified host:port pairs. based on work by harlan@genua.de + - Check for gl_matchc support in glob_t and fall back to the + openbsd-compat/glob.[ch] support if it does not exist. 20010315 - OpenBSD CVS Sync @@ -4584,4 +4586,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.967 2001/03/17 00:47:54 mouring Exp $ +$Id: ChangeLog,v 1.968 2001/03/17 01:15:38 mouring Exp $ @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.107 2001/03/14 00:39:46 djm Exp $ */ +/* $Id: acconfig.h,v 1.108 2001/03/17 01:15:38 mouring Exp $ */ #ifndef _CONFIG_H #define _CONFIG_H @@ -305,6 +305,9 @@ /* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */ #undef GLOB_HAS_ALTDIRFUNC +/* Define if your system glob() function has gl_matchc options in glob_t */ +#undef GLOB_HAS_GL_MATCHC + @BOTTOM@ /* ******************* Shouldn't need to edit below this line ************** */ diff --git a/configure.in b/configure.in index d3a902a8..a6ad607c 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.265 2001/03/14 00:39:46 djm Exp $ +# $Id: configure.in,v 1.266 2001/03/17 01:15:38 mouring Exp $ AC_INIT(ssh.c) @@ -388,6 +388,24 @@ AC_EGREP_CPP(FOUNDIT, ] ) +# Check for g.gl_matchc glob() extension +AC_MSG_CHECKING(for gl_matchc field in glob_t) +AC_EGREP_CPP(FOUNDIT, + [ + #include <glob.h> + int main(void){glob_t g; g.gl_matchc = 1;} + ], + [ + AC_DEFINE(GLOB_HAS_GL_MATCHC) + AC_MSG_RESULT(yes) + ], + [ + AC_MSG_RESULT(no) + ] +) + + + # Check whether user wants Kerberos support KRB4_MSG="no" AC_ARG_WITH(kerberos4, @@ -54,7 +54,8 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #ifdef HAVE_BSTRING_H # include <bstring.h> #endif -#if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) +#if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \ + defined(GLOB_HAS_GL_MATCHC) # include <glob.h> #endif #ifdef HAVE_NETGROUP_H diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 2e255186..e2fd7c27 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c @@ -37,7 +37,8 @@ #include "includes.h" #include <ctype.h> -#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) +#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \ + !defined(GLOB_HAS_GL_MATCHC) #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -855,5 +856,6 @@ qprintf(str, s) } #endif -#endif /* !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) */ +#endif /* !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || + !defined(GLOB_HAS_GL_MATCHC) */ diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h index 392c63b6..a08cee57 100644 --- a/openbsd-compat/glob.h +++ b/openbsd-compat/glob.h @@ -39,7 +39,8 @@ * @(#)glob.h 8.1 (Berkeley) 6/2/93 */ -#if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) +#if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \ + !defined(GLOB_HAS_GL_MATCHC) #ifndef _GLOB_H_ #define _GLOB_H_ @@ -94,5 +95,6 @@ void globfree __P((glob_t *)); #endif /* !_GLOB_H_ */ -#endif /* !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) */ +#endif /* !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || + !defined(GLOB_HAS_GL_MATCHC */ |