diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-01-21 17:04:36 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-01-21 17:04:36 +0000 |
commit | 740152054ecbda66dae0e0f66193d8e244cc2376 (patch) | |
tree | aa093561b97c930db58cecd18ac45401476d3a26 /string | |
parent | b9b49b44fdc1c74ad85076bca9ff7ea0200e2214 (diff) | |
download | glibc-740152054ecbda66dae0e0f66193d8e244cc2376.tar.gz |
Update.cvs/libc-ud-980122
1998-01-22 00:55 Ulrich Drepper <drepper@happy.cygnus.com>
* libc.map: Add __libc_uid, __libc_pid, __syscall_rt_sigqueueinfo,
__pread64, __pwrite64, and __getpid.
* libc/rt/aio_misc.c: Use pread and pwrite instead of __ protected
versions.
1998-01-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Define the
cancelable socket functions as __libc_xxx with __xxx as weak
alias.
* sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/m68k/socket.S: Allow __socket to be
redefined.
* sysdeps/unix/sysv/linux/i386/socket.S: Likewise.
* sysdeps/unix/sysv/linux/arm/socket.S: Likewise.
* sysdeps/unix/sysv/linux/powerpc/socket.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Likewise.
* sysdeps/unix/sysv/linux/accept.S: Make __libc_xxx the main name
and __xxx a weak alias.
* sysdeps/unix/sysv/linux/connect.S: Likewise.
* sysdeps/unix/sysv/linux/recv.S: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S: Likewise.
* sysdeps/unix/sysv/linux/recvmsg.S: Likewise.
* sysdeps/unix/sysv/linux/send.S: Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S: Likewise.
* sysdeps/unix/sysv/linux/sendto.S: Likewise.
1998-01-21 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* locale/langinfo.h: Add defines.
* dirent/dirent.h: Add defines for DT_*, check also for
_DIRENT_HAVE_D_TYPE.
Suggested by Roland McGrath.
1998-01-16 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/netinet/ip_fw.h:
Update from Linux 2.1.73+79.
* README.template: Update information about possible
configurations.
* manual/mbyte.texi (Wide String Conversion): Fix declaration of
wcstombs. Pointed out by Jochen Voss <voss@mathematik.uni-kl.de>.
[PR libc/417].
* manual/time.texi (Priority): Correct description of
PRIO_MAX. Pointed out by Jochen Voss <voss@mathematik.uni-kl.de>.
[PR libc/416].
11998-01-21 21:34 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/alpha/fpu/bits/mathdef.h: Add definition of FP_ILOGB0 and
FP_ILOGNAN. Patch by a sun <asun@zoology.washington.edu>.
1998-01-21 17:53 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/generic/_strerror.c: Handle BUFLEN == 0. Reported by
Andreas Jaeger.
1998-01-20 18:13 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-collate.c: Little optimizations.
* stdio-common/xbug.c: Unset LD_LIBRRARY_PATH variable.
* string/Makefile (tests): Add tst-inlcall.
* string/tst-inlcall.c: New file.
* string/strsignal.c: Add support for real-time signals.
* sysdeps/generic/_strerror.c: Fix Handling of unknown error in
presense of small buffer.
* sysdeps/i386/bits/string.h: Define _HAVE_STRING_ARCH_* macros.
* sysdeps/i386/i486/bits/string.h: Correct strrchr implementation
for i686.
* sysdeps/unix/sysv/linux/siglist.c: Change length of arrays to
_NSIG + 1.
1998-01-02 15:10 Matthias Urlichs <urlichs@noris.de>
* Rules: Add explicit rule for dummy.o; at least one library needs
it and it isn't autogenerated by the default rules.
1997-12-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c: Tweak epsilons.
1997-12-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/test-fenv.c (feenv_nomask_test): Avoid dumping core in the
child.
(feenv_mask_test): Likewise.
1998-01-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makeconfig: Don't export CPPFLAGS.
1998-01-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sunrpc/rpc_main.c (parseargs): Use perror to print error
message.
1998-01-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* nss/nss_db/db-alias.c (_nss_db_getaliasent_r): Don't include
terminating null in key size.
1998-01-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* nss/nss_files/files-service.c: Fix allocation size to include
length of PROTO.
* nss/nss_db/db-XXX.c (lookup): Always set errno and h_errno if
applicable. Fix return value and error checking.
(CONCAT(_nss_db_get,ENTNAME_r)): Loop around to skip over
unparsable lines.
(DB_LOOKUP): Allocate space for terminating null byte.
* nss/db-Makefile ($(VAR_DB)/passwd.db): Don't handle duplicate
uids specially.
* db2/makedb.c (process_input): Continue processing if a duplicate
key is encountered.
1998-01-19 15:20 Ulrich Drepper <drepper@cygnus.com>
* time/tzfile.h: Updated from tzcode1998b.
* time/zdump.c: Likewise.
* time/zic.c: Likewise.
* time/africa: Update from tzdata1998b.
* time/antarctica: Likewise.
* time/asia: Likewise.
* time/australasia: Likewise.
* time/etcetera: Likewise.
* time/europe: Likewise.
* time/leapseconds: Likewise.
* time/northamerica: Likewise.
* time/southamerica: Likewise.
1998-01-12 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* nss/nss_files/files-alias.c (get_next_alias): Do mail alias
lookups ignoring case.
* nss/nss_files/files-network.c: Do network lookups ignoring
case.
* nss/nss_files/files-hosts.c: Do hostname lookups ignoring
case.
* nss/nss_files/files-parse.c (LOOKUP_NAME_CASE): New macro for
case insensitive comparing.
Patches by Cristian Gafton <gafton@redhat.com>.
1998-01-09 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/net/if.h: Add IFF_*defines. Suggested
by Roland McGrath. [PR libc/395]
1998-01-08 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/arith.texi (Parsing of Integers): Correct description of
strtoul. Pointed out by Scott Snyder <snyder@fnald0.fnal.gov>.
[PR libc/396]
1997-12-30 14:14 Matthias Urlichs <urlichs@noris.de>
* misc/lsearch.c (lsearch): Return a pointer to the new element
if one was "allocated".
1997-12-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/strsignal.c: NSIG is not a valid index into
_sys_siglist. Don't zap the last character of the "Unknown
signal" message.
1998-01-19 15:08 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/charmap.c (parse_charmap): Correct parsing of
ellipsis expressions.
* locale/programs/charset.c (insert_char): Correctly insert value
of eliipsis expression.
Diffstat (limited to 'string')
-rw-r--r-- | string/Makefile | 2 | ||||
-rw-r--r-- | string/strsignal.c | 93 | ||||
-rw-r--r-- | string/tst-inlcall.c | 76 |
3 files changed, 163 insertions, 8 deletions
diff --git a/string/Makefile b/string/Makefile index 5b11a5885a..93d68a45be 100644 --- a/string/Makefile +++ b/string/Makefile @@ -42,7 +42,7 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \ strcoll_l strxfrm_l tests := tester inl-tester noinl-tester testcopy test-ffs \ - tst-strlen stratcliff tst-svc + tst-strlen stratcliff tst-svc tst-inlcall distribute := memcopy.h pagecopy.h tst-svc.expect diff --git a/string/strsignal.c b/string/strsignal.c index 69629b7855..41585dca00 100644 --- a/string/strsignal.c +++ b/string/strsignal.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 94, 95, 96, 97, 98 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 @@ -18,7 +18,9 @@ #include <signal.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> +#include <bits/libc-lock.h> #ifndef HAVE_GNU_LD @@ -27,23 +29,100 @@ /* Defined in siglist.c. */ extern const char *const _sys_siglist[]; +static __libc_key_t key; + +/* If nonzero the key allocation failed and we should better use a + static buffer than fail. */ +#define BUFFERSIZ 100 +static char local_buf[BUFFERSIZ]; +static char *static_buf; + +/* Destructor for the thread-specific data. */ +static void init (void); +static void free_key_mem (void *mem); +static char *getbuffer (void); /* Return a string describing the meaning of the signal number SIGNUM. */ char * strsignal (int signum) { + __libc_once_define (static, once); const char *desc; - if (signum < 0 || signum > NSIG || (desc = _sys_siglist[signum]) == NULL) + /* If we have not yet initialized the buffer do it now. */ + __libc_once (once, init); + + if ( +#ifdef SIGRTMIN + (signum >= SIGRTMIN && signum <= SIGRTMAX) || +#endif + signum < 0 || signum > NSIG || (desc = _sys_siglist[signum]) == NULL) { - static char buf[512]; - int len = __snprintf (buf, sizeof buf, _("Unknown signal %d"), signum); + char *buffer = getbuffer (); + int len = __snprintf (buffer, BUFFERSIZ - 1, +#ifdef SIGRTMIN + signum >= SIGRTMIN && signum <= SIGRTMAX + ? _("Real-time signal %d") : +#endif + _("Unknown signal %d"), signum); if (len < 0) - return NULL; - buf[len - 1] = '\0'; - return buf; + buffer = NULL; + else + buffer[len] = '\0'; + + return buffer; } return (char *) _(desc); } + + +/* Initialize buffer. */ +static void +init (void) +{ + if (__libc_key_create (&key, free_key_mem)) + /* Creating the key failed. This means something really went + wrong. In any case use a static buffer which is better than + nothing. */ + static_buf = local_buf; +} + + +/* Free the thread specific data, this is done if a thread terminates. */ +static void +free_key_mem (void *mem) +{ + free (mem); + __libc_setspecific (key, NULL); +} + + +/* Return the buffer to be used. */ +static char * +getbuffer (void) +{ + char *result; + + if (static_buf != NULL) + result = static_buf; + else + { + /* We don't use the static buffer and so we have a key. Use it + to get the thread-specific buffer. */ + result = __libc_getspecific (key); + if (result == NULL) + { + /* No buffer allocated so far. */ + result = malloc (BUFFERSIZ); + if (result == NULL) + /* No more memory available. We use the static buffer. */ + result = local_buf; + else + __libc_setspecific (key, result); + } + } + + return result; +} diff --git a/string/tst-inlcall.c b/string/tst-inlcall.c new file mode 100644 index 0000000000..3682e88ff6 --- /dev/null +++ b/string/tst-inlcall.c @@ -0,0 +1,76 @@ +/* Tester for calling inline string functions. + Copyright (C) 1998 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 it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + +/* Make sure we test the optimized inline functions. */ +#define __USE_STRING_INLINES 1 + +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <strings.h> +#include <fcntl.h> + + +int +main (void) +{ + int status; + int errors = 0; + char buf1[1000]; + char *cp; + char ch; + + cp = strcpy (buf1, "hello world"); + if (strcmp ("hello world", cp++) != 0) + { + puts ("strcmp test 1 failed"); + ++errors; + } + + cp = buf1; + if (strcmp (cp++, "hello world") != 0) + { + puts ("strcmp test 2 failed"); + ++errors; + } + + ch = 'h'; + if (strchr ("hello world", ch++) == NULL) + { + puts ("strchr test 1 failed"); + ++errors; + } + + if (errors == 0) + { + status = EXIT_SUCCESS; + puts ("No errors."); + } + else + { + status = EXIT_FAILURE; + printf ("%Zd errors.\n", errors); + } + exit (status); +} |