Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use syslog(3) instead of err(3) to log errors. 

Based on email conversation with Brian Ginsbach.

Add '%option never-interactive' to nslexer.l, to prevent isatty() from
being called unnecessarily.
Per discussion on current-users@ between Christian Biere and Greg Woods.
This commit is contained in:
lukem 2004-01-25 16:38:15 +00:00
parent ed0dd3010c
commit c5a53802fe
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libc/net/nslexer.l
View File

@ -1,5 +1,5 @@
%{
/* $NetBSD: nslexer.l,v 1.6 2002/11/11 19:29:03 thorpej Exp $ */
/* $NetBSD: nslexer.l,v 1.7 2004/01/25 16:38:15 lukem Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@ -39,15 +39,15 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: nslexer.l,v 1.6 2002/11/11 19:29:03 thorpej Exp $");
__RCSID("$NetBSD: nslexer.l,v 1.7 2004/01/25 16:38:15 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
#include <ctype.h>
#include <err.h>
#define _NS_PRIVATE
#include <nsswitch.h>
#include <string.h>
#include <syslog.h>
#include "nsparser.h"
@ -56,6 +56,7 @@ __RCSID("$NetBSD: nslexer.l,v 1.6 2002/11/11 19:29:03 thorpej Exp $");
%}
%option yylineno
%option never-interactive
BLANK [ \t]
CR \n
@ -83,8 +84,10 @@ STRING [a-zA-Z][a-zA-Z0-9_]*
char *p;
size_t i;
if ((p = strdup(yytext)) == NULL)
err(1, "nsdispatch: memory allocation failure");
if ((p = strdup(yytext)) == NULL) {
syslog(LOG_ERR, "libc nsdispatch: %m");
return NL;
}
for (i = 0; i < strlen(p); i++) {
if (isupper((unsigned char)p[i]))
@ -110,5 +113,6 @@ _nsyyerror(msg)
const char *msg;
{
warnx("%s line %d: %s at '%s'", _PATH_NS_CONF, yylineno, msg, yytext);
syslog(LOG_WARNING, "libc nsdispatch: %s line %d: %s at '%s'",
_PATH_NS_CONF, yylineno, msg, yytext);
} /* _nsyyerror */

34
lib/libc/net/nsparser.y
View File

@ -1,5 +1,5 @@
%{
/* $NetBSD: nsparser.y,v 1.8 2002/03/19 00:04:09 lukem Exp $ */
/* $NetBSD: nsparser.y,v 1.9 2004/01/25 16:38:15 lukem Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@ -39,17 +39,17 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: nsparser.y,v 1.8 2002/03/19 00:04:09 lukem Exp $");
__RCSID("$NetBSD: nsparser.y,v 1.9 2004/01/25 16:38:15 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
#include <assert.h>
#include <err.h>
#define _NS_PRIVATE
#include <nsswitch.h>
#include <stdio.h>
#include <string.h>
#include <syslog.h>
static void _nsaddsrctomap __P((const char *));
@ -94,9 +94,10 @@ Entry
lineno = _nsyylineno - (*_nsyytext == '\n' ? 1 : 0);
if (_nsdbtput(&curdbt) == -1)
/* XXX: syslog the following */
warn("%s line %d: error adding entry",
_PATH_NS_CONF, lineno);
syslog(LOG_WARNING,
"libc nsdispatch: %s line %d: %s",
_PATH_NS_CONF, lineno,
"error adding entry");
}
| error NL
{
@ -171,24 +172,27 @@ _nsaddsrctomap(elem)
if (curdbt.srclistsize > 0) {
if ((strcasecmp(elem, NSSRC_COMPAT) == 0) ||
(strcasecmp(curdbt.srclist[0].name, NSSRC_COMPAT) == 0)) {
/* XXX: syslog the following */
warnx("%s line %d: 'compat' used with other sources",
_PATH_NS_CONF, lineno);
syslog(LOG_WARNING,
"libc nsdispatch: %s line %d: %s",
_PATH_NS_CONF, lineno,
"'compat' used with other sources");
return;
}
}
for (i = 0; i < curdbt.srclistsize; i++) {
if (strcasecmp(curdbt.srclist[i].name, elem) == 0) {
/* XXX: syslog the following */
warnx("%s line %d: duplicate source '%s'",
_PATH_NS_CONF, lineno, elem);
syslog(LOG_WARNING,
"libc nsdispatch: %s line %d: %s '%s'",
_PATH_NS_CONF, lineno,
"duplicate source", elem);
return;
}
}
cursrc.name = elem;
if (_nsdbtaddsrc(&curdbt, &cursrc) == -1) {
/* XXX: syslog the following */
warn("%s line %d: error adding '%s'",
_PATH_NS_CONF, lineno, elem);
syslog(LOG_WARNING,
"libc nsdispatch: %s line %d: %s '%s'",
_PATH_NS_CONF, lineno,
"error adding", elem);
}
}