|
@@ -109,7 +109,7 @@ __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
|
|
|
|
|
|
|
|
|
static int LogFile = -1;
|
|
|
-static int connected;
|
|
|
+static smalluint connected;
|
|
|
static int LogStat = 0;
|
|
|
static const char *LogTag = "syslog";
|
|
|
static int LogFacility = LOG_USER;
|
|
@@ -117,7 +117,7 @@ static int LogMask = 0xff;
|
|
|
static struct sockaddr SyslogAddr;
|
|
|
|
|
|
static void
|
|
|
-closelog_intern(int to_default)
|
|
|
+closelog_intern(const smalluint to_default)
|
|
|
{
|
|
|
__UCLIBC_MUTEX_LOCK(mylock);
|
|
|
if (LogFile != -1) {
|
|
@@ -174,18 +174,15 @@ retry:
|
|
|
sizeof(SyslogAddr.sa_data) + strlen(SyslogAddr.sa_data)) != -1)
|
|
|
{
|
|
|
connected = 1;
|
|
|
- } else if (logType == SOCK_DGRAM) {
|
|
|
- logType = SOCK_STREAM;
|
|
|
- if (LogFile != -1) {
|
|
|
- close(LogFile);
|
|
|
- LogFile = -1;
|
|
|
- }
|
|
|
- goto retry;
|
|
|
} else {
|
|
|
if (LogFile != -1) {
|
|
|
close(LogFile);
|
|
|
LogFile = -1;
|
|
|
}
|
|
|
+ if (logType == SOCK_DGRAM) {
|
|
|
+ logType = SOCK_STREAM;
|
|
|
+ goto retry;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -206,10 +203,10 @@ vsyslog( int pri, const char *fmt, va_list ap )
|
|
|
time_t now;
|
|
|
int fd, saved_errno;
|
|
|
int rc;
|
|
|
- char tbuf[1024];
|
|
|
-
|
|
|
+ char tbuf[1024];
|
|
|
struct sigaction action, oldaction;
|
|
|
int sigpipe;
|
|
|
+
|
|
|
memset (&action, 0, sizeof (action));
|
|
|
action.sa_handler = sigpipe_handler;
|
|
|
sigemptyset (&action.sa_mask);
|
|
@@ -316,8 +313,7 @@ vsyslog( int pri, const char *fmt, va_list ap )
|
|
|
getout:
|
|
|
__UCLIBC_MUTEX_UNLOCK(mylock);
|
|
|
if (sigpipe == 0)
|
|
|
- sigaction (SIGPIPE, &oldaction,
|
|
|
- (struct sigaction *) NULL);
|
|
|
+ sigaction (SIGPIPE, &oldaction, (struct sigaction *) NULL);
|
|
|
}
|
|
|
libc_hidden_def(vsyslog)
|
|
|
|
|
@@ -350,7 +346,7 @@ int setlogmask(int pmask)
|
|
|
omask = LogMask;
|
|
|
__UCLIBC_MUTEX_LOCK(mylock);
|
|
|
if (pmask != 0)
|
|
|
- LogMask = pmask;
|
|
|
+ LogMask = pmask;
|
|
|
__UCLIBC_MUTEX_UNLOCK(mylock);
|
|
|
return (omask);
|
|
|
}
|