RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-22 10:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Check for gl_matchc support in glob_t and fall back to the

Browse Source 
openbsd-compat/glob.[ch] support if it does not exist.
This commit is contained in:
Ben Lindstrom 2001-03-17 01:15:38 +00:00
parent 7bb8b49596
commit 45b14dbddc
6 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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 $

5
acconfig.h
View File

@ -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 ************** */

20
configure.in
View File

@ -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,

3
includes.h
View File

@ -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

6
openbsd-compat/glob.c
View File

@ -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) */

6
openbsd-compat/glob.h
View File

@ -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 */