aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-10-31 22:55:02 +0000
committerUlrich Drepper <drepper@redhat.com>1997-10-31 22:55:02 +0000
commit1cab5444231a4a1fab9c3abb107d22af4eb09327 (patch)
treec58e953fe78f8094b3774b65eb2acf024cc10ded /inet/getnetgrent.c
parentCorrect last patch. (diff)
downloadglibc-1cab5444231a4a1fab9c3abb107d22af4eb09327.tar.gz
glibc-1cab5444231a4a1fab9c3abb107d22af4eb09327.tar.bz2
glibc-1cab5444231a4a1fab9c3abb107d22af4eb09327.zip
1997-10-31 23:16 Ulrich Drepper <drepper@cygnus.com> * posix/glob.c (glob): If calling glob_in_dir for a list which was generated by a glob call disable GLOB_ERR since there might be non-directories in the list (PR203). * posix/glob.h (GLOB_ONLYDIR): New flag. (__GLOB_FLAGS): Add GLOB_ONLYDIR. * posix/glob.c: Define HAVE_D_TYPE if _DIRENT_HAVE_D_TYPE is defined. (glob): Add GLOB_ONLYDIR to recursive call to match dirname. (glob_in_dir) [HAVE_D_TYPE]: While reading directory entries test whether they are directories if GLOB_ONLYDIR flag is given. * manual/pattern.texi: Document GLOB_ONLYDIR. * misc/Makefile (tests): Add tst-fdset. * sysdeps/i386/bits/select.h: Rewrite asm macros to be cleaner. * sysdeps/unix/sysv/linux/Dist: Add xstatconv.c. * sysdeps/unix/sysv/linux/alpha/Dist: Likewise. * time/strptime.c (strptime_internal): In %y format, regard years >= 69 as of twentieth century, all other as of twenty-first. * time/tzset.c: Correct typo and little optimization. 1997-10-31 16:01 Ulrich Drepper <drepper@cygnus.com> * inet/getnetgrent.c: Allocate buffer dynamically if needed. Suggested by Joe Keane <jgk@jgk.org>. 1997-10-31 Andreas Jaeger <aj@arthur.rhein-neckar.de> * io/ftw.h: Declare __ftw64_func_t and __nftw64_func_t only when __USE_FILE_OFFSET64 || __USE_LARGEFILE64 is true. 1997-10-30 05:47 Ulrich Drepper <drepper@cygnus.com> * misc/mntent.c: Don't use statically allocated buffer. Allocate it dynamically if necessary. * misc/efgcvt.c: Likewise. Patch by Joe Keane <jgk@jgk.org>. * misc/mntent.c: Allow freeing of allocated buffer in __libc_subfreeres. * misc/efgcvt.c: Likewise. * misc/efgcvt.c: Call correct reentrant functions. Use better values for MAXDIG. * misc/qefgcvt.c: Use better values for MAXDIG. 1997-10-29 18:48 Richard Henderson <rth@cygnus.com> * sysdeps/unix/sysv/linux/Makefile [io]: Add xstatconv. * sysdeps/unix/sysv/linux/alpha/xstatconv.c: New file. Convert between kernel_stat and the userland version indicated. * sysdeps/unix/sysv/linux/xstatconv.c: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h: Define _STAT_VER_KERNEL. * sysdeps/unix/sysv/linux/fxstat.c: Defer to __xstat_conv. Alias to __*xstat64 if requested. * sysdeps/unix/sysv/linux/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/xstat.c: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Add struct stat64. Increment _STAT_VER, and make struct stat the same. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Add __ino64_t, and __off64_t. Reorganize. * sysdeps/unix/sysv/linux/alpha/kernel_stat.h: Add struct glibc2_stat for backward compatibility. Define XSTAT_IS_XSTAT64. * sysdeps/unix/sysv/linux/alpha/fxstat64.c: Empty file. * sysdeps/unix/sysv/linux/alpha/lxstat64.c: Likewise. * sysdeps/unix/sysv/linux/alpha/xstat64.c: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/dirent.h (struct dirent): For consistency, force d_ino to use ino_t and supply padding. 1997-10-29 18:47 Richard Henderson <rth@cygnus.com> * libio/iofopen.c: Correct weak_alias.
Diffstat (limited to 'inet/getnetgrent.c')
-rw-r--r--inet/getnetgrent.c41
1 files changed, 38 insertions, 3 deletions
diff --git a/inet/getnetgrent.c b/inet/getnetgrent.c
index c310e0128e..88b06ffc98 100644
--- a/inet/getnetgrent.c
+++ b/inet/getnetgrent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,13 +16,48 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <errno.h>
#include <netdb.h>
+#include <stdlib.h>
+#include <bits/libc-lock.h>
+/* Statis buffer for return value. We allocate it when needed. */
+static char *buffer;
+/* All three strings should fit in a block of 1kB size. */
+#define BUFSIZE 1024
+
+
+
+static void
+allocate (void)
+{
+ buffer = (char *) malloc (BUFSIZE);
+}
int
getnetgrent (char **hostp, char **userp, char **domainp)
{
- static char buffer[1024]; /* All three strings shouldn't use 1kB. */
+ __libc_once_define (static, once);
+ __libc_once (once, allocate);
+
+ if (buffer == NULL)
+ {
+ __set_errno (ENOMEM);
+ return -1;
+ }
- return __getnetgrent_r (hostp, userp, domainp, buffer, sizeof (buffer));
+ return __getnetgrent_r (hostp, userp, domainp, buffer, BUFSIZE);
}
+
+
+/* Make sure the memory is freed if the programs ends while in
+ memory-debugging mode and something actually was allocated. */
+static void
+__attribute__ ((unused))
+free_mem (void)
+{
+ if (buffer != NULL)
+ free (buffer);
+}
+
+text_set_element (__libc_subfreeres, free_mem);