mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-05 21:00:05 +00:00
c877418f2e
New macros. * elf/dl-close.c (free_mem): Use libc_freeres_fn macro, remove text_set_element. * elf/dl-libc.c (free_mem): Likewise. * iconv/gconv_conf.c (free_mem): Likewise. * iconv/gconv_db.c (free_mem): Likewise. * iconv/gconv_dl.c (free_mem): Likewise. * iconv/gconv_cache.c (free_mem): Likewise. * intl/finddomain.c (free_mem): Likewise. * intl/dcigettext.c (free_mem): Likewise. * locale/setlocale.c (free_mem): Likewise. * misc/fstab.c (fstab_free): Likewise. * nss/nsswitch.c (free_mem): Likewise. * posix/regcomp.c (free_mem): Likewise. * resolv/gai_misc.c (free_res): Likewise. * stdlib/fmtmsg.c (free_mem): Likewise. * sunrpc/clnt_perr.c (free_mem): Likewise. * sysdeps/generic/setenv.c (free_mem): Likewise. * sysdeps/unix/sysv/linux/shm_open.c (freeit): Likewise. * sysdeps/pthread/aio_misc.c (free_res): Likewise. * time/tzset.c (free_mem): Likewise. * malloc/mtrace.c (release_libc_mem): Add __libc_freeres_fn_section. * locale/loadarchive.c (_nl_archive_subfreeres): Likewise. * malloc/set-freeres.c (__libc_freeres): Likewise. * login/getutent.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutent): Allocate buffer the first time it is run. * login/getutid.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutid): Allocate buffer the first time it is run. * login/getutline.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutline): Allocate buffer the first time it is run. * malloc/mtrace.c (malloc_trace_buffer): Change into char *. (mtrace): Allocate malloc_trace_buffer. * resolv/nsap_addr.c (inet_nsap_ntoa): Decrease size of tmpbuf. * resolv/ns_print.c (ns_sprintrrf): Decrease size of t. * string/strerror.c: Include libintl.h and errno.h. (buf): New variable. (strerror): Only allocate buffer if actually needed (unknown error). * time/tzfile.c (transitions): Add libc_freeres_ptr. (freeres): Remove. 2002-10-25 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (libc_freeres_ptr): New macro. * malloc/set-freeres.c (__libc_freeres_ptrs): Define using symbol_set_define. (__libc_freeres): Free all pointers in that section. * Makerules (build-shlib): Add $(LDSEDCMD-$(@F:lib%.so=%).so) to sed commands when creating .lds script. (LDSEDCMD-c.so): New variable. * inet/rcmd.c (ahostbuf): Change into char *. Add libc_freeres_ptr. (rcmd_af): Use strdup to allocate ahostbuf. * inet/rexec.c (ahostbuf): Change into char *. Add libc_freeres_ptr. (rexec_af): Use strdup to allocate ahostbuf. * stdio-common/reg-printf.c (printf_funcs): Remove. (__printf_arginfo_table): Change into printf_arginfo_function **. Add libc_freeres_ptr. (__register_printf_function): Allocate __printf_arginfo_table and __printf_function_table the first time it is called. * stdio-common/printf-parse.h (__printf_arginfo_table): Change into printf_arginfo_function **. (parse_one_spec): Add __builtin_expect. * grp/fgetgrent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * inet/getnetgrent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * intl/localealias.c (libc_freeres_ptr): Define if !_LIBC. (string_space, map): Add libc_freeres_ptr. (free_mem): Remove. * misc/efgcvt.c (FCVT_BUFPTR): Add libc_freeres_ptr. (free_mem): Remove. * misc/mntent.c (getmntent_buffer): Add libc_freeres_ptr. (free_mem): Remove. * crypt/md5-crypt.c (libc_freeres_ptr): Define if !_LIBC. (buffer): Add libc_freeres_ptr. (free_mem): Remove for _LIBC. * nss/getXXbyYY.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * nss/getXXent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * pwd/fgetpwent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * resolv/res_hconf.c (ifaddrs): Add libc_freeres_ptr. (free_mem): Remove. * shadow/fgetspent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/posix/ttyname.c (getttyname_name): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/unix/sysv/linux/getsysstats.c (mount_proc): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/unix/sysv/linux/ttyname.c (getttyname_name, ttyname_buf): Add libc_freeres_ptr. (free_mem): Remove. 2002-10-30 Jakub Jelinek <jakub@redhat.com> * malloc/obstack.c [_LIBC] (obstack_free): Change into strong_alias instead of duplicating the whole function in libc.
409 lines
10 KiB
C
409 lines
10 KiB
C
/* Copyright (C) 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <fmtmsg.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/syslog.h>
|
|
#ifdef USE_IN_LIBIO
|
|
# include <wchar.h>
|
|
#endif
|
|
|
|
|
|
/* We have global data, protect the modification. */
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
|
|
enum
|
|
{
|
|
label_mask = 0x01,
|
|
severity_mask = 0x02,
|
|
text_mask = 0x04,
|
|
action_mask = 0x08,
|
|
tag_mask = 0x10,
|
|
all_mask = label_mask | severity_mask | text_mask | action_mask | tag_mask
|
|
};
|
|
|
|
static const struct
|
|
{
|
|
size_t len;
|
|
/* Adjust the size if new elements are added. */
|
|
const char name[12];
|
|
} keywords[] =
|
|
{
|
|
{ 5, "label" },
|
|
{ 8, "severity" },
|
|
{ 4, "text" },
|
|
{ 6, "action"},
|
|
{ 3, "tag" }
|
|
};
|
|
#define NKEYWORDS (sizeof( keywords) / sizeof (keywords[0]))
|
|
|
|
|
|
struct severity_info
|
|
{
|
|
int severity;
|
|
const char *string;
|
|
struct severity_info *next;
|
|
};
|
|
|
|
|
|
/* List of known severities. */
|
|
static const struct severity_info nosev =
|
|
{
|
|
MM_NOSEV, "", NULL
|
|
};
|
|
static const struct severity_info haltsev =
|
|
{
|
|
MM_HALT, "HALT", (struct severity_info *) &nosev
|
|
};
|
|
static const struct severity_info errorsev =
|
|
{
|
|
MM_ERROR, "ERROR", (struct severity_info *) &haltsev
|
|
};
|
|
static const struct severity_info warningsev =
|
|
{
|
|
MM_WARNING, "WARNING", (struct severity_info *) &errorsev
|
|
};
|
|
static const struct severity_info infosev =
|
|
{
|
|
MM_INFO, "INFO", (struct severity_info *) &warningsev
|
|
};
|
|
|
|
/* 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)
|
|
internal_function;
|
|
|
|
|
|
int
|
|
fmtmsg (long int classification, const char *label, int severity,
|
|
const char *text, const char *action, const char *tag)
|
|
{
|
|
__libc_once_define (static, once);
|
|
int result = MM_OK;
|
|
struct severity_info *severity_rec;
|
|
|
|
/* make sure everything is initialized. */
|
|
__libc_once (once, init);
|
|
|
|
/* Start the real work. First check whether the input is ok. */
|
|
if (label != MM_NULLLBL)
|
|
{
|
|
/* Must be two fields, separated by a colon. */
|
|
const char *cp = strchr (label, ':');
|
|
if (cp == NULL)
|
|
return MM_NOTOK;
|
|
|
|
/* The first field must not contain more then 10 bytes. */
|
|
if (cp - label > 10
|
|
/* The second field must not have more then 14 bytes. */
|
|
|| strlen (cp + 1) > 14)
|
|
return MM_NOTOK;
|
|
}
|
|
|
|
for (severity_rec = severity_list; severity_rec != NULL;
|
|
severity_rec = severity_rec->next)
|
|
if (severity == severity_rec->severity)
|
|
/* Bingo. */
|
|
break;
|
|
|
|
/* If we don't know anything about the severity level return an error. */
|
|
if (severity_rec == NULL)
|
|
return MM_NOTOK;
|
|
|
|
|
|
/* Now we can print. */
|
|
if (classification & MM_PRINT)
|
|
{
|
|
int do_label = (print & label_mask) && label != MM_NULLLBL;
|
|
int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
|
|
int do_text = (print & text_mask) && text != MM_NULLTXT;
|
|
int do_action = (print & action_mask) && action != MM_NULLACT;
|
|
int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
|
|
|
|
#ifdef USE_IN_LIBIO
|
|
if (_IO_fwide (stderr, 0) > 0)
|
|
{
|
|
if (__fwprintf (stderr, L"%s%s%s%s%s%s%s%s%s%s\n",
|
|
do_label ? label : "",
|
|
do_label
|
|
&& (do_severity | do_text | do_action | do_tag)
|
|
? ": " : "",
|
|
do_severity ? severity_rec->string : "",
|
|
do_severity && (do_text | do_action | do_tag)
|
|
? ": " : "",
|
|
do_text ? text : "",
|
|
do_text && (do_action | do_tag) ? "\n" : "",
|
|
do_action ? "TO FIX: " : "",
|
|
do_action ? action : "",
|
|
do_action && do_tag ? " " : "",
|
|
do_tag ? tag : "") < 0)
|
|
/* Oh, oh. An error occurred during the output. */
|
|
result = MM_NOMSG;
|
|
}
|
|
else
|
|
#endif
|
|
if (fprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
|
|
do_label ? label : "",
|
|
do_label && (do_severity | do_text | do_action | do_tag)
|
|
? ": " : "",
|
|
do_severity ? severity_rec->string : "",
|
|
do_severity && (do_text | do_action | do_tag) ? ": " : "",
|
|
do_text ? text : "",
|
|
do_text && (do_action | do_tag) ? "\n" : "",
|
|
do_action ? "TO FIX: " : "",
|
|
do_action ? action : "",
|
|
do_action && do_tag ? " " : "",
|
|
do_tag ? tag : "") < 0)
|
|
/* Oh, oh. An error occurred during the output. */
|
|
result = MM_NOMSG;
|
|
}
|
|
|
|
if (classification & MM_CONSOLE)
|
|
{
|
|
int do_label = label != MM_NULLLBL;
|
|
int do_severity = severity != MM_NULLSEV;
|
|
int do_text = text != MM_NULLTXT;
|
|
int do_action = action != MM_NULLACT;
|
|
int do_tag = tag != MM_NULLTAG;
|
|
|
|
syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
|
|
do_label ? label : "",
|
|
do_label && (do_severity | do_text | do_action | do_tag)
|
|
? ": " : "",
|
|
do_severity ? severity_rec->string : "",
|
|
do_severity && (do_text | do_action | do_tag) ? ": " : "",
|
|
do_text ? text : "",
|
|
do_text && (do_action | do_tag) ? "\n" : "",
|
|
do_action ? "TO FIX: " : "",
|
|
do_action ? action : "",
|
|
do_action && do_tag ? " " : "",
|
|
do_tag ? tag : "");
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* 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 = __strchrnul (sevlevel_var, ':');
|
|
int level;
|
|
|
|
/* 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_function
|
|
internal_addseverity (int severity, const char *string)
|
|
{
|
|
struct severity_info *runp, *lastp;
|
|
int result = MM_OK;
|
|
|
|
/* First see if there is already a record for the severity level. */
|
|
for (runp = severity_list, lastp = NULL; runp != NULL; runp = runp-> next)
|
|
if (runp->severity == severity)
|
|
break;
|
|
else
|
|
lastp = runp;
|
|
|
|
if (runp != NULL)
|
|
{
|
|
/* Release old string. */
|
|
free ((char *) runp->string);
|
|
|
|
if (string != NULL)
|
|
/* Change the string. */
|
|
runp->string = string;
|
|
else
|
|
{
|
|
/* Remove the severity class. */
|
|
if (lastp == NULL)
|
|
severity_list = runp->next;
|
|
else
|
|
lastp->next = runp->next;
|
|
|
|
free (runp);
|
|
}
|
|
}
|
|
else if (string != NULL)
|
|
{
|
|
runp = malloc (sizeof (*runp));
|
|
if (runp == NULL)
|
|
result = MM_NOTOK;
|
|
else
|
|
{
|
|
runp->severity = severity;
|
|
runp->next = severity_list;
|
|
runp->string = string;
|
|
severity_list = runp;
|
|
}
|
|
}
|
|
else
|
|
/* We tried to remove a non-existing severity class. */
|
|
result = MM_NOTOK;
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Add new severity level or remove old one. */
|
|
int
|
|
addseverity (int severity, const char *string)
|
|
{
|
|
int result;
|
|
const char *new_string;
|
|
|
|
/* Prevent illegal SEVERITY values. */
|
|
if (severity <= MM_INFO)
|
|
return MM_NOTOK;
|
|
|
|
if (string == NULL)
|
|
/* We want to remove the severity class. */
|
|
new_string = NULL;
|
|
else
|
|
{
|
|
new_string = __strdup (string);
|
|
|
|
if (new_string == NULL)
|
|
/* Allocation failed or illegal value. */
|
|
return MM_NOTOK;
|
|
}
|
|
|
|
/* Protect the global data. */
|
|
__libc_lock_lock (lock);
|
|
|
|
/* Do the real work. */
|
|
result = internal_addseverity (severity, string);
|
|
|
|
if (result != MM_OK)
|
|
/* Free the allocated string. */
|
|
free ((char *) new_string);
|
|
|
|
/* Release the lock. */
|
|
__libc_lock_unlock (lock);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
libc_freeres_fn (free_mem)
|
|
{
|
|
struct severity_info *runp = severity_list;
|
|
|
|
while (runp != NULL)
|
|
if (runp->severity > MM_INFO)
|
|
{
|
|
/* This is data we have to release. */
|
|
struct severity_info *here = runp;
|
|
free ((char *) runp->string);
|
|
runp = runp->next;
|
|
free (here);
|
|
}
|
|
else
|
|
runp = runp->next;
|
|
}
|