summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-19 21:29:30 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-19 21:29:30 +0000
commit9911f120831a46e8455d3625e2f410d0c1692621 (patch)
tree86e0ebefb44caf39bde98558189d8917846aff90
parent11c78f81199f191e19b8e8658a3f6dee22689c2e (diff)
- (bal) Oops. Missed globc.h change (OpenBSD CVS).
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/glob.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7311adff..037c1855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
20010320
- (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS).
- (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS).
+ - (bal) Oops. Missed globc.h change (OpenBSD CVS).
20010319
- (djm) Seed PRNG at startup, rather than waiting for arc4random calls to
@@ -4631,4 +4632,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.987 2001/03/19 19:00:09 mouring Exp $
+$Id: ChangeLog,v 1.988 2001/03/19 21:29:30 mouring Exp $
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index a08cee57..b4c8f7aa 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: glob.h,v 1.4 1998/01/31 17:06:26 millert Exp $ */
+/* $OpenBSD: glob.h,v 1.5 2001/03/18 17:18:58 deraadt Exp $ */
/* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */
/*
@@ -82,6 +82,7 @@ typedef struct {
#define GLOB_QUOTE 0x0400 /* Quote special chars with \. */
#define GLOB_TILDE 0x0800 /* Expand tilde names from the passwd file. */
#define GLOB_NOESCAPE 0x1000 /* Disable backslash escaping. */
+#define GLOB_LIMIT 0x2000 /* Limit pattern match output to ARG_MAX */
/* Error values returned by glob(3) */
#define GLOB_NOSPACE (-1) /* Malloc call failed. */