c
/
daemonitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save and restore errno before using %m specifier

This commit is contained in:
Laurence Withers 2008-07-26 20:47:49 +00:00
parent 38b6caa6f9
commit 92ec05ab67
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/daemonitor/200_log.c
View File

@ -111,11 +111,14 @@ int log_func_fd;
void log_func_file(int level, const char* fmt, ...) void log_func_file(int level, const char* fmt, ...)
{ {
va_list va; va_list va;
int ret; int ret, saved_errno;
const char* level_str; const char* level_str;
char timebuf[40]; char timebuf[40];
time_t t; time_t t;
/* save errno, because dprintf will clobber it */
saved_errno = errno;
/* choose appropriate line description */ /* choose appropriate line description */
switch(level) { switch(level) {
case LOG_EMERG: level_str = "EMERG"; break; case LOG_EMERG: level_str = "EMERG"; break;
@ -136,6 +139,7 @@ void log_func_file(int level, const char* fmt, ...)
/* print to file descriptor */ /* print to file descriptor */
va_start(va, fmt); va_start(va, fmt);
ret = dprintf(log_func_fd, "%s %s ", timebuf, level_str); ret = dprintf(log_func_fd, "%s %s ", timebuf, level_str);
errno = saved_errno;
if(ret != -1) ret = vdprintf(log_func_fd, fmt, va); if(ret != -1) ret = vdprintf(log_func_fd, fmt, va);
if(ret != -1 && safe_write_fixed(log_func_fd, "\n", 1) != 1) ret = -1; if(ret != -1 && safe_write_fixed(log_func_fd, "\n", 1) != 1) ret = -1;
va_end(va); va_end(va);