- (djm) Add replacement glob() from OpenBSD libc if the system glob is

   missing or lacks the GLOB_ALTDIRFUNC extension
 - (djm) Remove -I$(srcdir)/openbsd-compat from CFLAGS, refer to headers
   relatively. Avoids conflict between glob.h and /usr/include/glob.h

1 files changed, 98 insertions, 0 deletions

diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
new file mode 100644
index 000000000..392c63b67
--- /dev/null
+++ b/openbsd-compat/glob.h
@@ -0,0 +1,98 @@
+/*      $OpenBSD: glob.h,v 1.4 1998/01/31 17:06:26 millert Exp $        */
+/*      $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $     */
+
+/*
+ * Copyright (c) 1989, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Guido van Rossum.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      @(#)glob.h      8.1 (Berkeley) 6/2/93
+ */
+
+#if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC)
+
+#ifndef _GLOB_H_
+#define _GLOB_H_
+
+struct stat;
+typedef struct {
+        int gl_pathc;           /* Count of total paths so far. */
+        int gl_matchc;          /* Count of paths matching pattern. */
+        int gl_offs;            /* Reserved at beginning of gl_pathv. */
+        int gl_flags;           /* Copy of flags parameter to glob. */
+        char **gl_pathv;        /* List of paths matching pattern. */
+                                /* Copy of errfunc parameter to glob. */
+        int (*gl_errfunc) __P((const char *, int));
+
+        /*
+         * Alternate filesystem access methods for glob; replacement
+         * versions of closedir(3), readdir(3), opendir(3), stat(2)
+         * and lstat(2).
+         */
+        void (*gl_closedir) __P((void *));
+        struct dirent *(*gl_readdir) __P((void *));     
+        void *(*gl_opendir) __P((const char *));
+        int (*gl_lstat) __P((const char *, struct stat *));
+        int (*gl_stat) __P((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. */
+
+/* Error values returned by glob(3) */
+#define GLOB_NOSPACE    (-1)    /* Malloc call failed. */
+#define GLOB_ABORTED    (-2)    /* Unignored error. */
+#define GLOB_NOMATCH    (-3)    /* No match and GLOB_NOCHECK not set. */
+#define GLOB_NOSYS      (-4)    /* Function not supported. */
+#define GLOB_ABEND      GLOB_ABORTED
+
+int     glob __P((const char *, int, int (*)(const char *, int), glob_t *));
+void    globfree __P((glob_t *));
+
+#endif /* !_GLOB_H_ */
+
+#endif /* !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) */
+