From 7f24a0e64774e6566242f44b0f06ab06607d0c97 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 10 Nov 2005 16:18:56 +1100
Subject:  - (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.

---
 openbsd-compat/glob.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'openbsd-compat/glob.h')

diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index 3428b2013..5d80073d3 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: include/glob.h */
-
 /*	$OpenBSD: glob.h,v 1.8 2003/06/02 19:34:12 millert Exp $	*/
 /*	$NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $	*/
 
@@ -37,6 +35,8 @@
  *	@(#)glob.h	8.1 (Berkeley) 6/2/93
  */
 
+/* OPENBSD ORIGINAL: include/glob.h */
+
 #if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \
     !defined(GLOB_HAS_GL_MATCHC)
 
-- 
cgit v1.2.3


From 50a221ba7ac156ce8b961d4f860886f4a5499cdf Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 10 Nov 2005 17:03:22 +1100
Subject:  - (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9.

---
 ChangeLog             | 3 ++-
 openbsd-compat/glob.h | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'openbsd-compat/glob.h')

diff --git a/ChangeLog b/ChangeLog
index c4db5a49c..4e2f98d15 100644
--- 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
@@ -3270,4 +3271,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3971 2005/11/10 06:02:21 dtucker Exp $
+$Id: ChangeLog,v 1.3972 2005/11/10 06:03:22 dtucker Exp $
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index 5d80073d3..4fdbfc1ea 100644
--- 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) */
-- 
cgit v1.2.3