Import of OpenSSH 4.9p1

[gssapi-openssh.git] / openssh / openbsd-compat / glob.h

diff --git a/openssh/openbsd-compat/glob.h b/openssh/openbsd-compat/glob.h
index 3428b201352ec404cca90d13a36b93582615bb13..a2b36f97453a2caf9ca53d66825a8aa654ae02cc 100644 (file)
--- a/openssh/openbsd-compat/glob.h
+++ b/openssh/openbsd-compat/glob.h
@@ -1,6 +1,4 @@
-/* OPENBSD ORIGINAL: include/glob.h */
-
-/*     $OpenBSD: glob.h,v 1.8 2003/06/02 19:34:12 millert Exp $        */
+/*     $OpenBSD: glob.h,v 1.10 2005/12/13 00:35:22 millert Exp $       */
 /*     $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $     */
 
 /*
@@ -37,8 +35,12 @@
  *     @(#)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)
+    !defined(GLOB_HAS_GL_MATCHC) || \
+    !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0 || \
+    defined(BROKEN_GLOB)
 
 #ifndef _GLOB_H_
 #define        _GLOB_H_
@@ -65,22 +67,13 @@ typedef struct {
        int (*gl_stat)(const char *, struct stat *);
 } glob_t;
 
-/* Flags */
 #define        GLOB_APPEND     0x0001  /* Append to output from previous call. */
 #define        GLOB_DOOFFS     0x0002  /* Use gl_offs. */
 #define        GLOB_ERR        0x0004  /* Return on error. */
 #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_ALTDIRFUNC 0x0040  /* Use alternately specified directory funcs. */
-#define        GLOB_BRACE      0x0080  /* Expand braces ala csh. */
-#define        GLOB_MAGCHAR    0x0100  /* Pattern had globbing characters. */
-#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) */
 #define        GLOB_NOSPACE    (-1)    /* Malloc call failed. */
@@ -89,6 +82,14 @@ typedef struct {
 #define        GLOB_NOSYS      (-4)    /* Function not supported. */
 #define GLOB_ABEND     GLOB_ABORTED
 
+#define        GLOB_ALTDIRFUNC 0x0040  /* Use alternately specified directory funcs. */
+#define        GLOB_BRACE      0x0080  /* Expand braces ala csh. */
+#define        GLOB_MAGCHAR    0x0100  /* Pattern had globbing characters. */
+#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_LIMIT     0x2000  /* Limit pattern match output to ARG_MAX */
+
 int    glob(const char *, int, int (*)(const char *, int), glob_t *);
 void   globfree(glob_t *);