- (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9.

diff --git a/ChangeLog b/ChangeLog
index 0aa8c5f2e5b00010450814b6d70b3e2a3ceb97dc..172e08754a6b9e486bc69a2e6419a9b17252fb13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
  - (dtucker) [openbsd-compat/readpassphrase.c] Update from OpenBSD 1.16 -> 1.18.
  - (dtucker) [openbsd-compat/readpassphrase.h] Update from OpenBSD 1.3 -> 1.5.
  - (dtucker) [openbsd-compat/glob.c] Update from OpenBSD 1.22 -> 1.25.
+ - (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9.
 
 20051105
  - (djm) OpenBSD CVS Sync

diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index 5d80073d360864538163696fcb8d37be8c631cc1..4fdbfc1eabd8ef8c149c91161046e12d13f8bf35 100644 (file)
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: glob.h,v 1.8 2003/06/02 19:34:12 millert Exp $        */
+/*     $OpenBSD: glob.h,v 1.9 2004/10/07 16:56:11 millert Exp $        */
 /*     $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $     */
 
 /*
@@ -72,6 +72,7 @@ typedef struct {
 #define        GLOB_MARK       0x0008  /* Append / to matching directories. */
 #define        GLOB_NOCHECK    0x0010  /* Return pattern itself if nothing matches. */
 #define        GLOB_NOSORT     0x0020  /* Don't sort. */
+#define        GLOB_NOESCAPE   0x1000  /* Disable backslash escaping. */
 
 #define        GLOB_ALTDIRFUNC 0x0040  /* Use alternately specified directory funcs. */
 #define        GLOB_BRACE      0x0080  /* Expand braces ala csh. */
@@ -79,7 +80,6 @@ typedef struct {
 #define        GLOB_NOMAGIC    0x0200  /* GLOB_NOCHECK without magic chars (csh). */
 #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) */