mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-20 08:56:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert log text to current locale before passing it on to stderr or syslog.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@933 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-05-18 10:36:36 +00:00
parent 83591883d8
commit 13798312ef
2 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/daemon/main.c
View file

@ -35,6 +35,7 @@
#include <limits.h> #include <limits.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <locale.h>
#include <sys/types.h> #include <sys/types.h>
#include <liboil/liboil.h> #include <liboil/liboil.h>
@ -161,6 +162,8 @@ int main(int argc, char *argv[]) {
struct timeval tv; struct timeval tv;
#endif #endif
setlocale(LC_ALL, "");
pa_limit_caps(); pa_limit_caps();
#ifdef HAVE_GETUID #ifdef HAVE_GETUID

35
src/polypcore/log.c
View file

@ -33,6 +33,7 @@
#include <syslog.h> #include <syslog.h>
#endif #endif
#include <polyp/utf8.h>
#include <polyp/xmalloc.h> #include <polyp/xmalloc.h>
#include <polypcore/core-util.h> #include <polypcore/core-util.h>
@ -41,7 +42,7 @@
#define ENV_LOGLEVEL "POLYP_LOG" #define ENV_LOGLEVEL "POLYP_LOG"
static char *log_ident = NULL; static char *log_ident = NULL, *log_ident_local = NULL;
static pa_log_target_t log_target = PA_LOG_STDERR; static pa_log_target_t log_target = PA_LOG_STDERR;
static void (*user_log_func)(pa_log_level_t l, const char *s) = NULL; static void (*user_log_func)(pa_log_level_t l, const char *s) = NULL;
static pa_log_level_t maximal_level = PA_LOG_NOTICE; static pa_log_level_t maximal_level = PA_LOG_NOTICE;
@ -59,8 +60,13 @@ static const int level_to_syslog[] = {
void pa_log_set_ident(const char *p) { void pa_log_set_ident(const char *p) {
if (log_ident) if (log_ident)
pa_xfree(log_ident); pa_xfree(log_ident);
if (log_ident_local)
pa_xfree(log_ident_local);
log_ident = pa_xstrdup(p); log_ident = pa_xstrdup(p);
log_ident_local = pa_utf8_to_locale(log_ident);
if (!log_ident_local)
log_ident_local = pa_xstrdup(log_ident);
} }
void pa_log_set_maximal_level(pa_log_level_t l) { void pa_log_set_maximal_level(pa_log_level_t l) {
@ -100,6 +106,7 @@ void pa_log_levelv(pa_log_level_t level, const char *format, va_list ap) {
switch (log_target) { switch (log_target) {
case PA_LOG_STDERR: { case PA_LOG_STDERR: {
const char *prefix = "", *suffix = ""; const char *prefix = "", *suffix = "";
char *local_t;
#ifndef OS_IS_WIN32 #ifndef OS_IS_WIN32
/* Yes indeed. Useless, but fun! */ /* Yes indeed. Useless, but fun! */
@ -114,16 +121,34 @@ void pa_log_levelv(pa_log_level_t level, const char *format, va_list ap) {
} }
#endif #endif
fprintf(stderr, "%s%s%s\n", prefix, t, suffix); local_t = pa_utf8_to_locale(t);
if (!local_t)
fprintf(stderr, "%s%s%s\n", prefix, t, suffix);
else {
fprintf(stderr, "%s%s%s\n", prefix, local_t, suffix);
pa_xfree(local_t);
}
break; break;
} }
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
case PA_LOG_SYSLOG: case PA_LOG_SYSLOG: {
openlog(log_ident ? log_ident : "???", LOG_PID, LOG_USER); char *local_t;
syslog(level_to_syslog[level], "%s", t);
openlog(log_ident_local ? log_ident_local : "???", LOG_PID, LOG_USER);
local_t = pa_utf8_to_locale(t);
if (!local_t)
syslog(level_to_syslog[level], "%s", t);
else {
syslog(level_to_syslog[level], "%s", local_t);
pa_xfree(local_t);
}
closelog(); closelog();
break; break;
}
#endif #endif
case PA_LOG_USER: case PA_LOG_USER: