projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No C99 initialisers, gcc 2.95.3 doesn't like it.
[tinc]
/
src
/
logger.c
diff --git
a/src/logger.c
b/src/logger.c
index
de66227
..
f85bd15
100644
(file)
--- a/
src/logger.c
+++ b/
src/logger.c
@@
-17,28
+17,22
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: logger.c,v 1.1.2.
1 2003/07/06 22:11:31
guus Exp $
+ $Id: logger.c,v 1.1.2.
8 2003/07/29 22:59:00
guus Exp $
*/
*/
-#include <stdio.h>
-#include <stdarg.h>
-#include <syslog.h>
+#include "system.h"
#include "conf.h"
#include "logger.h"
#include "conf.h"
#include "logger.h"
-#include "system.h"
-
-volatile int debug_level = DEBUG_NOTHING;
-int logmode = LOGMODE_STDERR;
-pid_t logpid;
+debug_t debug_level = DEBUG_NOTHING;
+static logmode_t logmode = LOGMODE_STDERR;
+static pid_t logpid;
extern char *logfilename;
extern char *logfilename;
-FILE *logfile = NULL;
-const char *logident = NULL;
-
-void openlogger(const char *ident, int mode) {
- char *fname;
+static FILE *logfile = NULL;
+static const char *logident = NULL;
+void openlogger(const char *ident, logmode_t mode) {
logident = ident;
logmode = mode;
logident = ident;
logmode = mode;
@@
-53,23
+47,33
@@
void openlogger(const char *ident, int mode) {
logmode = LOGMODE_NULL;
break;
case LOGMODE_SYSLOG:
logmode = LOGMODE_NULL;
break;
case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG_H
openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
break;
openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
break;
+#endif
+ case LOGMODE_NULL:
+ break;
}
}
}
}
-void vlogger(int priority, const char *format, va_list ap) {
+void logger(int priority, const char *format, ...) {
+ va_list ap;
+
+ va_start(ap, format);
+
switch(logmode) {
case LOGMODE_STDERR:
vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
switch(logmode) {
case LOGMODE_STDERR:
vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
+ fflush(stderr);
break;
case LOGMODE_FILE:
break;
case LOGMODE_FILE:
- fprintf(logfile, "%d %s[%d]: ", time(NULL), logident, logpid);
+ fprintf(logfile, "%
l
d %s[%d]: ", time(NULL), logident, logpid);
vfprintf(logfile, format, ap);
fprintf(logfile, "\n");
break;
case LOGMODE_SYSLOG:
vfprintf(logfile, format, ap);
fprintf(logfile, "\n");
break;
case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG_H
#ifdef HAVE_VSYSLOG
vsyslog(priority, format, ap);
#else
#ifdef HAVE_VSYSLOG
vsyslog(priority, format, ap);
#else
@@
-80,7
+84,12
@@
void vlogger(int priority, const char *format, va_list ap) {
}
#endif
break;
}
#endif
break;
+#endif
+ case LOGMODE_NULL:
+ break;
}
}
+
+ va_end(ap);
}
void closelogger(void) {
}
void closelogger(void) {
@@
-89,7
+98,13
@@
void closelogger(void) {
fclose(logfile);
break;
case LOGMODE_SYSLOG:
fclose(logfile);
break;
case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG_H
closelog();
break;
closelog();
break;
+#endif
+ case LOGMODE_NULL:
+ case LOGMODE_STDERR:
+ break;
+ break;
}
}
}
}