Commit Graph

17 Commits

Author SHA1 Message Date
Damien Miller
fbcb9a7fa5 upstream commit
revision 1.48
date: 2019/02/04 16:45:40;  author: millert;  state: Exp;  lines: +16 -17;  commitid: cpNtVC7erojNyctw;
Make gl_pathc, gl_matchc and gl_offs size_t in glob_t to match POSIX.
This requires a libc major version bump.  OK deraadt@
2019-11-15 16:06:30 +11:00
Darren Tucker
8db134e7f4 Prevent name collisions with system glob (bz#2463)
Move glob.h from includes.h to the only caller (sftp) and override the
names for the symbols.  This prevents name collisions with the system glob
in the case where something other than ssh uses it (eg kerberos).  With
jjelen at redhat.com, ok djm@
2015-10-29 10:48:23 +11:00
Tim Rice
bdd3e67c19 - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with
1.12 to unbreak Solaris build.
   ok djm@
2010-10-24 18:35:55 -07:00
Damien Miller
2738361878 sadly, two typos on one line is not my best record 2010-10-07 22:00:24 +11:00
Damien Miller
faca8ccd4d unbreak previous 2010-10-07 21:59:40 +11:00
Damien Miller
a6e121aaa0 - djm@cvs.openbsd.org 2010/09/25 09:30:16
[sftp.c configure.ac openbsd-compat/glob.c openbsd-compat/glob.h]
     make use of new glob(3) GLOB_KEEPSTAT extension to save extra server
     rountrips to fetch per-file stat(2) information.
     NB. update openbsd-compat/ glob(3) implementation from OpenBSD libc to
     match.
2010-10-07 21:39:17 +11:00
Darren Tucker
528d6fa10a - (dtucker) [configure.ac openbsd-compat/glob.{c,h}] Bug #1407: force use of
builtin glob implementation on Mac OS X.  Based on a patch from
   vgiffin at apple.
2007-12-31 21:29:26 +11:00
Damien Miller
0ff80a1b17 - millert@cvs.openbsd.org 2004/10/07 16:56:11
GLOB_NOESCAPE is POSIX so move it out of the #ifndef _POSIX_SOURCE
     block.
     (NB. mostly an RCS ID sync, as portable strips out the conditionals)
2007-10-26 16:48:13 +10:00
Darren Tucker
096faecdea - (dtucker) [configure.ac includes.h openbsd-compat/glob.{c,h}] Explicitly
test for GLOB_NOMATCH and use our glob functions if it's not found.
   Stops sftp from segfaulting when attempting to get a nonexistent file on
   Cygwin (previous versions of OpenSSH didn't use the native glob). Partly
   from and tested by Corinna Vinschen.
2006-09-01 20:29:10 +10:00
Darren Tucker
50a221ba7a - (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9. 2005-11-10 17:03:22 +11:00
Darren Tucker
7f24a0e647 - (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL" markers to
after the copyright notices.  Having them at the top next to the CVSIDs
   guarantees a conflict for each and every sync.
2005-11-10 16:18:56 +11:00
Damien Miller
3db2e4daf7 - (djm) Annotate OpenBSD-derived files in openbsd-compat/ with original
source file path (in OpenBSD tree).
2003-11-24 13:33:34 +11:00
Damien Miller
329638e49c - (djm) Sync openbsd-compat with OpenBSD CVS.
- No more 4-term BSD licenses in our tree
2003-06-03 12:12:50 +10:00
Damien Miller
71eb0c1550 - (djm) Sync openbsd-compat with OpenBSD -current 2002-09-11 10:29:11 +10:00
Ben Lindstrom
9911f12083 - (bal) Oops. Missed globc.h change (OpenBSD CVS). 2001-03-19 21:29:30 +00:00
Ben Lindstrom
45b14dbddc - Check for gl_matchc support in glob_t and fall back to the
openbsd-compat/glob.[ch] support if it does not exist.
2001-03-17 01:15:38 +00:00
Damien Miller
3c02768950 - (djm) Add replacement glob() from OpenBSD libc if the system glob is
missing or lacks the GLOB_ALTDIRFUNC extension
 - (djm) Remove -I$(srcdir)/openbsd-compat from CFLAGS, refer to headers
   relatively. Avoids conflict between glob.h and /usr/include/glob.h
2001-03-14 11:39:45 +11:00