* stdlib/strtol.c: Use #ifdef, not #if, for HAVE_LIMITS_H.

	* posix/glob.c (glob_in_dir): Allocate GLOB_MARK byte in case when
 	(NFOUND == 0 && (FLAGS & GLOB_NOCHECK)).

4 files changed, 17 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 0feb593..3b4b581 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Mon Aug  7 14:04:36 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* stdlib/strtol.c: Use #ifdef, not #if, for HAVE_LIMITS_H.
+
+	* posix/glob.c (glob_in_dir): Allocate GLOB_MARK byte in case when
+ 	(NFOUND == 0 && (FLAGS & GLOB_NOCHECK)).
+
 	* sysdeps/generic/sysd-stdio.c (__stdio_reopen): Return failure
  	when __stdio_open fails with a code other than ENFILE or EMFILE.
 
diff --git a/NEWS b/NEWS
index be5eb46..915af45 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  27 March 1995
+GNU C Library NEWS -- history of user-visible changes.  26 July 1995
 
 Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
 See the end for copying conditions.
@@ -23,10 +23,14 @@ Version 1.10
   Run `configure --help' to see the details.
 
 * The library can now be configured to build profiling, highly-optimized
-  (but undebuggable), and/or shared libraries (ELF with GNU ld only).
-  The `--enable-profile', `--enable-omitfp', and `--enable-shared'
-  options to `configure' enable building these extra libraries.
-  The shared library is built by default when using both ELF and GNU ld.
+  (but undebuggable), and/or shared libraries (ELF with GNU ld only).  The
+  `--enable-profile', `--enable-omitfp', and `--enable-shared' options to
+  `configure' enable building these extra libraries.  The shared library is
+  built by default when using both ELF and GNU ld.  When shared libraries
+  are enabled, the new library `-ldl' is available for arbitrary run-time
+  loading of shared objects; its interface is defined in <dlfcn.h>.  The
+  new header file <link.h> gives access to the internals of the run-time
+  dynamic linker, `ld.so'.
 
 * The new functions `strtoq' and `strtouq' parse integer values from
   strings, like `strtol' and `strtoul', but they return `long long int' and
@@ -71,7 +75,7 @@ Version 1.10
 * The new header file <fts.h> and suite of functions simplify programs that
   operate on directory trees.  This code comes from 4.4 BSD.
 
-* The resolver code has been updated from the BIND-4.9.3-BETA14 release.
+* The resolver code has been updated from the BIND-4.9.3-BETA24 release.
 
 * The new function `malloc_find_object_address' finds the starting address
   of a malloc'd block, given any address within the block.  This can be
diff --git a/posix/glob.c b/posix/glob.c
index 38a6d75..1354150 100644
--- a/posix/glob.c
+++ b/posix/glob.c
@@ -635,7 +635,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
       nfound = 1;
       names = (struct globlink *) __alloca (sizeof (struct globlink));
       names->next = NULL;
-      names->name = (char *) malloc (len + 1);
+      names->name = (char *) malloc (len + ((flags & GLOB_MARK) ? 1 : 0) + 1);
       if (names->name == NULL)
 	goto memory_error;
       memcpy (names->name, pattern, len);
diff --git a/stdlib/strtol.c b/stdlib/strtol.c
index 1d63bbe..8c1a683 100644
--- a/stdlib/strtol.c
+++ b/stdlib/strtol.c
@@ -33,7 +33,7 @@ Cambridge, MA 02139, USA.  */
 extern int errno;
 #endif
 
-#if HAVE_LIMITS_H
+#ifdef HAVE_LIMITS_H
 # include <limits.h>
 #endif