From 503054c0dd57109017b36870c430dab00fccaa8b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 4 Jul 1996 00:07:18 +0000 Subject: Wed Jul 3 16:29:41 1996 Roland McGrath * nss/getXXbyYY_r.c (REENTRANT_NAME): Cast FCT in __nss_next call. * sysdeps/generic/sbrk.c: Always call __brk (0) to update __curbrk. * malloc/malloc-size.c (malloc_usable_size): Renamed from malloc_object_allocation_size. * malloc/malloc.h: Fix decl. * sys/select.h: New file, wrapper header. * posix/sys/types.h [__USE_BSD]: Include ; remove fd_set, associated macros, and select decl. * sysdeps/posix/isfdtype.c: New file. Tue Jul 2 23:45:14 1996 Ulrich Drepper The latest Japanese proposal for POSIX locales renames the CHARMAP keyword in locale definition files to CHARCONV. * locale/programs/ld-ctype.c, locale/programs/locales.h: Rename function ctype_is_charmap to ctype_is_charconv. * locale/programs/locfile-kw.gperf: Replace charmap keyword with charconv. * locale/programs/locfile-token.h: Add definition of token charconv. * locale/programs/locfile.c: Recognize charconv keyword. Rename lables according to this. * locale/weight.h (get_weight): Cast constants to prevent warnings. * stdlib/strtod.c, stdlib/strtol.c, string/strcoll.c, string/strxfrm.c: Add some more casts to prevent signed<->unsigned warnings. New stuff described in P1003.1g. * misc/Makefile (headers): Add sys/select.h. (routines): Add pselect. * misc/sys/select.h: New file. Declare select functions and needed data types and macros. * sysdeps/generic/pselect.c: New file. Add generic implementation of pselect() function which uses select(). * posix/getconf.c: Recognize new variables from P1003.1g. * posix/posix1_lim.h: Define _POSIX_FD_SETSIZE, _POSIX_QLIMIT, _POSIX_HIWAT, and _POSIX_UIO_MAXIOV. * posix/unistd.h: Add description of the P1003.1g variables. * sysdeps/generic/confname.h: Define _SC_* values for new variables. * sysdeps/posix/fpathconf.c (fpathconf): Add handling of _PC_SOCK_MAXBUF. * sysdeps/stub/fpathconf.c (fpathconf): Ditto. * sysdeps/posix/sysconf.c (sysconf): Add handling of new P1003.1g variables. * sysdeps/stub/sysconf.c (sysconf): Ditto. * sysdeps/unix/sysv/linux/posix_opt.h: Define _POSIX_POLL and _POSIX_SELECT since Linux has this. * socket/Makefile (routines): Add isfdtype. * sysdeps/generic/sys/socket.h: Add prototype for isfdtype. * sysdeps/stub/isfdtype.c: New file. Stub implementation of isfdtype. * wcsmbs/wcrtomb.c (wcrtomb): Fix typo. --- sysdeps/generic/sbrk.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'sysdeps/generic/sbrk.c') diff --git a/sysdeps/generic/sbrk.c b/sysdeps/generic/sbrk.c index de7794697d..698f814e2b 100644 --- a/sysdeps/generic/sbrk.c +++ b/sysdeps/generic/sbrk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996 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 modify @@ -30,7 +30,11 @@ __sbrk (ptrdiff_t increment) { void *oldbrk; - if (__curbrk == 0 && __brk (0) < 0) + /* Always update __curbrk from the kernel's brk value. That way two + separate instances of __brk and __sbrk can share the heap, returning + interleaved pieces of it. This happens when libc.so is loaded by + dlopen in a statically-linked program that already uses __brk. */ + if (__brk (0) < 0) return (void *) -1; if (increment == 0) -- cgit v1.2.3