Updated from libc

diff --git a/glob/ChangeLog b/glob/ChangeLog
index 1dd02efc0346b376a4d1ffe7429bf178b50d9ce9..911a48748dd6bf8cd9c85bc21b79f37e16a57ddf 100644 (file)
--- a/glob/ChangeLog
+++ b/glob/ChangeLog
@@ -1,3 +1,18 @@
+Fri Jan 19 13:28:59 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+       * posix/glob.c (glob): Use prototype in getlogin decl.
+
+Thu Jan 18 00:32:43 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+       * posix/glob.c (_GNU_SOURCE): Define if undefined, so glob.h
+       defines GNU extensions.
+       * posix/fnmatch.c: Likewise.
+
+Fri Jan 12 13:40:01 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+       * posix/glob.c (glob): Add parens in glob call flags arg for
+       GLOB_BRACE case.
+
 Thu Dec 14 02:28:22 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
        * posix/glob.c (glob_in_dir): Cast result of opendir to __ptr_t,

diff --git a/glob/fnmatch.c b/glob/fnmatch.c
index 1ef5599e23461cdaf04b0015391fcf9fcc4c5d16..1ddea809616e2998d98147106b15b4d3d05f1293 100644 (file)
--- a/glob/fnmatch.c
+++ b/glob/fnmatch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996 Free Software Foundation, Inc.
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public License as
@@ -19,6 +19,11 @@ Cambridge, MA 02139, USA.  */
 #include <config.h>
 #endif
 
+/* Enable GNU extensions in fnmatch.h.  */
+#ifndef _GNU_SOURCE
+#define        _GNU_SOURCE     1
+#endif
+
 #include <errno.h>
 #include <fnmatch.h>
 #include <ctype.h>

diff --git a/glob/glob.c b/glob/glob.c
index 954960cb182b65d2784b20ad0d81047a7c0ca84c..c8f2eabc5d3a9bd2b71dfc3cb5f6dfbf6e837a20 100644 (file)
--- a/glob/glob.c
+++ b/glob/glob.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public License as
@@ -24,6 +24,11 @@ Cambridge, MA 02139, USA.  */
 #include <config.h>
 #endif
 
+/* Enable GNU extensions in glob.h.  */
+#ifndef _GNU_SOURCE
+#define        _GNU_SOURCE     1
+#endif
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -290,7 +295,7 @@ glob (pattern, flags, errfunc, pglob)
                  memcpy (buf, pattern, begin - pattern);
                  memcpy (buf + (begin - pattern), p, comma - p);
                  memcpy (buf + (begin - pattern) + (comma - p), end, restlen);
-                 result = glob (buf, (flags & ~(GLOB_NOCHECK|GLOB_NOMAGIC) |
+                 result = glob (buf, ((flags & ~(GLOB_NOCHECK|GLOB_NOMAGIC)) |
                                       GLOB_APPEND), errfunc, pglob);
                  if (result && result != GLOB_NOMATCH)
                    return result;
@@ -353,7 +358,7 @@ glob (pattern, flags, errfunc, pglob)
          dirname = getenv ("HOME");
          if (dirname == NULL || dirname[0] == '\0')
            {
-             extern char *getlogin ();
+             extern char *getlogin __P ((void));
              char *name = getlogin ();
              if (name != NULL)
                {