summaryrefslogtreecommitdiff
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 7311adffc..037c1855b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120010320 120010320
2 - (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS). 2 - (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS).
3 - (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS). 3 - (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS).
4 - (bal) Oops. Missed globc.h change (OpenBSD CVS).
4 5
520010319 620010319
6 - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to 7 - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to
@@ -4631,4 +4632,4 @@
4631 - Wrote replacements for strlcpy and mkdtemp 4632 - Wrote replacements for strlcpy and mkdtemp
4632 - Released 1.0pre1 4633 - Released 1.0pre1
4633 4634
4634$Id: ChangeLog,v 1.987 2001/03/19 19:00:09 mouring Exp $ 4635$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 a08cee572..b4c8f7aaa 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: glob.h,v 1.4 1998/01/31 17:06:26 millert Exp $ */ 1/* $OpenBSD: glob.h,v 1.5 2001/03/18 17:18:58 deraadt Exp $ */
2/* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */ 2/* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */
3 3
4/* 4/*
@@ -82,6 +82,7 @@ typedef struct {
82#define GLOB_QUOTE 0x0400 /* Quote special chars with \. */ 82#define GLOB_QUOTE 0x0400 /* Quote special chars with \. */
83#define GLOB_TILDE 0x0800 /* Expand tilde names from the passwd file. */ 83#define GLOB_TILDE 0x0800 /* Expand tilde names from the passwd file. */
84#define GLOB_NOESCAPE 0x1000 /* Disable backslash escaping. */ 84#define GLOB_NOESCAPE 0x1000 /* Disable backslash escaping. */
85#define GLOB_LIMIT 0x2000 /* Limit pattern match output to ARG_MAX */
85 86
86/* Error values returned by glob(3) */ 87/* Error values returned by glob(3) */
87#define GLOB_NOSPACE (-1) /* Malloc call failed. */ 88#define GLOB_NOSPACE (-1) /* Malloc call failed. */