diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-08-02 21:00:51 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-08-02 21:00:51 +0000 |
commit | 8f2ece695d8822e9ecc63ecd157e90bf17a6fe65 (patch) | |
tree | 8391ab64ce8c9c6e45d137905f75f1d17c9ed987 /stdlib/fmtmsg.c | |
parent | 3996f34b46043ed8ea8fdc6f44377d969d64396b (diff) | |
download | glibc-8f2ece695d8822e9ecc63ecd157e90bf17a6fe65.zip glibc-8f2ece695d8822e9ecc63ecd157e90bf17a6fe65.tar.gz glibc-8f2ece695d8822e9ecc63ecd157e90bf17a6fe65.tar.bz2 |
Update.cvs/libc-ud-970802
1997-08-02 21:27 Ulrich Drepper <drepper@cygnus.com>
* inet/Makefile (headers): Rename netinet/inbits.h to bits/in.h.
* inet/netinet/in.h: Include bits/in.h instead of netinet/inbits.h.
* sysdeps/generic/netinet/inbits.h: Move to...
* sysdeps/generic/bits/in.h: ... here.
* sysdeps/unix/sysv/linux/bits/inbits.h: Move to ...
* sysdeps/unix/sysv/linux/bits/in.h: ... here.
* nis/Makefile (headers): Add bits/nislib.h.
* nis/rpcsvc/nislib.h: Moved to ....
* nis/bits/nislib.h: ... here.
* nis/nss_compat/compat-grp.c: Don't include <rpcsvc/nislib.h>.
* nis/nss_compat/compat-pwd.c: Likewise.
* nis/nss_compat/compat-spwd.c: Likewise.
* nis/nss_nisplus/nisplus-alias.c: Likewise.
* nis/nss_nisplus/nisplus-ethers.c: Likewise.
* nis/nss_nisplus/nisplus-grp.c: Likewise.
* nis/nss_nisplus/nisplus-hosts.c: Likewise.
* nis/nss_nisplus/nisplus-netgrp.c: Likewise.
* nis/nss_nisplus/nisplus-ntework.c: Likewise.
* nis/nss_nisplus/nisplus-proto.c: Likewise.
* nis/nss_nisplus/nisplus-publickey.c: Likewise.
* nis/nss_nisplus/nisplus-pwd.c: Likewise.
* nis/nss_nisplus/nisplus-rpc.c: Likewise.
* nis/nss_nisplus/nisplus-service.c: Likewise.
* nis/nss_nisplus/nisplus-spwd.c: Likewise.
* nis/rpcsvc/nis.x: Include bits/nislib.h, not rpcsvc/nislib.h.
* nis/rpcsvc/nis.h: Likewise.
* inet/getnameinfo.c (nrl_domainname): Change return type to const
char *.
(getnameinfo): Change type of local variable c to const char *.
* inet/inet_ntoa.c: Rewrite to use __libc_once for initialization.
* stdlib/fmtmsg.c: Likewise.
* intl/bindtextdom.c: Update from latest gettext.
* intl/dcgettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/localealias.c: Likewise.
* intl/textdomain.c: Likewise.
* login/getutid_r.c: Remove parameter to setutent call.
* login/getutline_r.c: Likewise.
* posix/wordexp.c: Complete rewrite. Not fully implemented yet,
though. Patch by Tim Waugh <tim@cyberelk.demon.co.uk>.
* stdio-common/printf_fp.c: Remove relative include paths.
* stdio-common/printf_fphex.c: Likewise.
* sysdeps/generic/crypt.h: Cleanup. Don't define non standard
elements unless __USE_GNU.
* sysdeps/generic/vlimit.c: Pretty print.
* sysdeps/generic/vtimes.c: Likewise.
* sysdeps/i386/elf/bsd-_setjmp.S: New file. Empty dummy file.
* sysdeps/i386/elf/bsd-setjmp.S: New file. Empty dummy file.
* sysdeps/i386/elf/setjmp.S: New file. Define __setjmp and also
weak definitions of setjmp and _setjmp.
* sysdeps/i386/fpu/bits/mathinline.h: More patches by John Bowman.
* sysdeps/stub/if_index.h: Set errno in all functions and add
stub warnings.
* sysdeps/stub/libc-lock.h: Add __libc_once.
1997-08-02 01:57 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/ptrace.c: Don't set errno in error
case since the __syscall_ptrace call already did this.
Reported by Philip Gladstone <philip@talon.raptor.com>.
1997-07-29 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/fsuid.h: Change include
<gnu/types.h> to <sys/types.h>.
1997-08-01 23:18 Ulrich Drepper <drepper@cygnus.com>
* csu/defs.awk: Fix regexp for end and align.
Patch by Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>.
* locale/programs/localedef.c (print_escaped): New function.
(show_info): Use print_escaped if strings can control unprintable
characters.
Patch by Jochen Hein <jochen.hein@delphi.central.de>.
1997-08-01 18:45 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nss_nisplus/nisplus-alias.c: Fix NULL pointer problems
* nis/nss_nisplus/nisplus-grp.c: Likewise.
1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/dl-profile.c (_dl_start_profile): Use _dl_sysdep_error
instead of fprintf.
1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/socket.texi (Host Address Functions): Fix arguments of
@deftypefun.
1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/dl-runtime.c: Avoid warning about profile_fixup being
unused.
* sysdeps/m68k/dl-machine.h: Add support for shared library
profiling.
1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* md5-crypt/Makefile (extra-objs): Add onlymd5-crypt.o for
dependencies.
1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Make-dist (subdirs): Distribute both aout and elf.
1997-07-31 23:04 Mark Kettenis <kettenis@phys.uva.nl>
* login/utmp-private.h: Remove reset argument from backend
setutent.
* login/getutent_r.c (__setutent): Allways call the setutent
function in the daemon backend.
(setutent_unknown): Function removed.
(getutent_unknown, pututline_unknown): Call __setutent instead of
setutent_unknown.
* login/utmp_file.c (setutent_file): Removed reset argument. All
callers changed.
* login/utmp_daemon.c (setutent_daemon): Removed reset
argument. All callers changed. Try to open connection even if a
previous connection failed, but first check if the sockets exist
in the filesystem.
* login/utmp_daemon.c (pututline_daemon): Try to open connection
before reporting failure.
* login/programs/database.c (open_database): Create compatibility
file if it does not already exist. Supply mode argument in open
calls to guarantee that created files have the proper protection.
* login/programs/utmpd.c (main): Remove files created by a
previous `bind' before creating sockets.
Suggested by a sun <asum@zoology.washington.edu>.
1997-07-29 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c: Remove unneeded function check_int_exec.
* BUGS: Correct typos.
* gmon/gmon.c: Add alias for monstartup, declare _strerror_internal.
1997-07-30 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/socket.texi (Host Address Functions): Reformat inet_ntop
entry to confirm with expected behaviour of some scripts.
* libc.map: Add functions/variables in global namespace,
remove wildcards.
1997-07-29 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* resolv/libresolv.map: Add variables and routines used by named,
nslookup and other bind utils.
* libc.map: Likewise.
1997-07-31 00:35 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/unix/sysv/linux/if_index.c: Rewrite to avoid using /proc
filesystem.
* inet/test_ifindex.c: New file.
* inet/Makefile (tests): Add test_ifindex.
1997-08-01 04:25 Ulrich Drepper <drepper@cygnus.com>
* nis/nss_nisplus/nisplus-parser.c: Fix another bug in the parser.
Patch by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>.
* manual/errno.texi: Fix typo.
Reported by Erik Talvola <etalvo@sapient.com>.
(write_hist): Remove dependency on 32 bit int.
Diffstat (limited to 'stdlib/fmtmsg.c')
-rw-r--r-- | stdlib/fmtmsg.c | 185 |
1 files changed, 94 insertions, 91 deletions
diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c index cbe4291..9945ab9 100644 --- a/stdlib/fmtmsg.c +++ b/stdlib/fmtmsg.c @@ -87,8 +87,11 @@ static const struct severity_info infosev = /* Start of the list. */ static struct severity_info *severity_list = (struct severity_info *) &infosev; +/* Mask of values we will print. */ +static int print; /* Prototypes for local functions. */ +static void init (void); static int internal_addseverity (int severity, const char *string); @@ -96,100 +99,12 @@ int fmtmsg (long int classification, const char *label, int severity, const char *text, const char *action, const char *tag) { - static int print = -1; + __libc_once_define (once); int result = MM_OK; struct severity_info *severity_rec; - if (print == -1) - { - __libc_lock_lock (lock); - - if (print == -1) - { - const char *msgverb_var = getenv ("MSGVERB"); - const char *sevlevel_var = getenv ("SEV_LEVEL"); - - if (msgverb_var != NULL && msgverb_var[0] != '\0') - { - /* Using this extra variable allows us to work without - locking. */ - print = 0; - - do - { - size_t cnt; - - for (cnt = 0; cnt < NKEYWORDS; ++cnt) - if (memcmp (msgverb_var, - keywords[cnt].name, keywords[cnt].len) == 0 - && (msgverb_var[keywords[cnt].len] == ':' - || msgverb_var[keywords[cnt].len] == '\0')) - break; - - if (cnt < NKEYWORDS) - { - print |= 1 << cnt; - - msgverb_var += keywords[cnt].len; - if (msgverb_var[0] == ':') - ++msgverb_var; - } - else - { - /* We found an illegal keyword in the - environment variable. The specifications say - that we print all fields. */ - print = all_mask; - break; - } - } - while (msgverb_var[0] != '\0'); - } - else - print = all_mask; - - - if (sevlevel_var != NULL) - while (sevlevel_var[0] != '\0') - { - const char *end = strchr (sevlevel_var, ':'); - int level; - - if (end == NULL) - end = strchr (sevlevel_var, '\0'); - - /* First field: keyword. This is not used here but it - must be present. */ - while (sevlevel_var < end) - if (*sevlevel_var++ == ',') - break; - - if (sevlevel_var < end) - { - /* Second field: severity level, a number. */ - char *cp; - - level = strtol (sevlevel_var, &cp, 0); - if (cp != sevlevel_var && cp < end && *cp++ == ',' - && level > MM_INFO) - { - const char *new_string; - - new_string = __strndup (cp, end - cp); - - if (new_string != NULL - && (internal_addseverity (level, new_string) - != MM_OK)) - free ((char *) new_string); - } - } - - sevlevel_var = end + (*end == ':' ? 1 : 0); - } - } - - __libc_lock_unlock (lock); - } + /* make sure everything is initialized. */ + __libc_once (once, init); /* Start the real work. First check whether the input is ok. */ if (label != MM_NULLLBL) @@ -268,6 +183,94 @@ fmtmsg (long int classification, const char *label, int severity, } +/* Initialize from environment variable content. */ +static void +init (void) +{ + const char *msgverb_var = getenv ("MSGVERB"); + const char *sevlevel_var = getenv ("SEV_LEVEL"); + + if (msgverb_var != NULL && msgverb_var[0] != '\0') + { + /* Using this extra variable allows us to work without locking. */ + do + { + size_t cnt; + + for (cnt = 0; cnt < NKEYWORDS; ++cnt) + if (memcmp (msgverb_var, + keywords[cnt].name, keywords[cnt].len) == 0 + && (msgverb_var[keywords[cnt].len] == ':' + || msgverb_var[keywords[cnt].len] == '\0')) + break; + + if (cnt < NKEYWORDS) + { + print |= 1 << cnt; + + msgverb_var += keywords[cnt].len; + if (msgverb_var[0] == ':') + ++msgverb_var; + } + else + { + /* We found an illegal keyword in the environment + variable. The specifications say that we print all + fields. */ + print = all_mask; + break; + } + } + while (msgverb_var[0] != '\0'); + } + else + print = all_mask; + + + if (sevlevel_var != NULL) + { + __libc_lock_lock (lock); + + while (sevlevel_var[0] != '\0') + { + const char *end = strchr (sevlevel_var, ':'); + int level; + + if (end == NULL) + end = strchr (sevlevel_var, '\0'); + + /* First field: keyword. This is not used here but it must be + present. */ + while (sevlevel_var < end) + if (*sevlevel_var++ == ',') + break; + + if (sevlevel_var < end) + { + /* Second field: severity level, a number. */ + char *cp; + + level = strtol (sevlevel_var, &cp, 0); + if (cp != sevlevel_var && cp < end && *cp++ == ',' + && level > MM_INFO) + { + const char *new_string; + + new_string = __strndup (cp, end - cp); + + if (new_string != NULL + && (internal_addseverity (level, new_string) + != MM_OK)) + free ((char *) new_string); + } + } + + sevlevel_var = end + (*end == ':' ? 1 : 0); + } + } +} + + /* Add the new entry to the list. */ static int internal_addseverity (int severity, const char *string) |