1 files changed, 97 insertions, 92 deletions

diff --git a/src/customdhcpcd/logger.c b/src/customdhcpcd/logger.c
index 2c8431d..48e6fa6 100644
--- a/src/customdhcpcd/logger.c
+++ b/src/customdhcpcd/logger.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * dhcpcd - DHCP client daemon
  * Copyright 2006-2008 Roy Marples <roy@marples.name>
  * All rights reserved
@@ -46,109 +46,114 @@
 static int loglevel = LOG_WARNING;
 static char logprefix[12] = { 0 };
 
-int logtolevel(const char *priority) {
-	CODE *c;
+int logtolevel(const char *priority)
+{
+  CODE *c;
 
-	if (isdigit ((int) *priority))
-		return (atoi(priority));
+  if (isdigit ((int) *priority))
+    return (atoi(priority));
 
-	for (c = prioritynames; c->c_name; c++)
-		if (!strcasecmp(priority, c->c_name))
-			return (c->c_val);
+  for (c = prioritynames; c->c_name; c++)
+    if (!strcasecmp(priority, c->c_name))
+      return (c->c_val);
 
-	return (-1);
+  return (-1);
 }
 
-static const char *leveltolog(int level) {
-	CODE *c;
+static const char *leveltolog(int level)
+{
+  CODE *c;
 
-	for (c = prioritynames; c->c_name; c++)
-		if (c->c_val == level)
-			return (c->c_name);
+  for (c = prioritynames; c->c_name; c++)
+    if (c->c_val == level)
+      return (c->c_name);
 
-	return (NULL);
+  return (NULL);
 }
 
-void setloglevel(int level) {
-	loglevel = level;
+void setloglevel(int level)
+{
+  loglevel = level;
 }
 
-void setlogprefix(const char *prefix) {
-	snprintf(logprefix, sizeof(logprefix), "%s", prefix);
+void setlogprefix(const char *prefix)
+{
+  snprintf(logprefix, sizeof(logprefix), "%s", prefix);
 }
 
-void logger(int level, const char *fmt, ...) {
-	va_list p;
-	//va_list p2;
-//	FILE *f = stderr;
-	FILE *f;
-	FILE *f2;
-	char* path = "/tmp/cdhcpcd.log";
-	char* msgpath = "/tmp/cdhcpcd-msg.log";
-	int size = 512;
-	char *msg = (char *) malloc (size);
-
-
-	f = fopen(path,"a");
-	f2 = fopen(msgpath,"a");
-	va_start (p, fmt);
-	//va_copy (p2, p);
-
-
-	vsnprintf (msg, size, fmt, p);
-	strcat(msg,"\n");
-	logToQt(level, DHCPCD_LOG, msg);
-
-	fprintf(f2, "%s, %s", leveltolog(level), logprefix);
-	fprintf(f2, "%s", msg);
-	fputc('\n', f2);
-
-	fprintf(f, "%s, %s", leveltolog(level), logprefix);
-	vfprintf(f, fmt, p);
-	fputc('\n', f);
-
-	/* stdout, stderr may be re-directed to some kind of buffer.
-	 * So we always flush to ensure it's written. */
-	fflush(f);
-
-//	//logLoggerToQt(level, fmt, p);
-//	if (level <= LOG_ERR || level <= loglevel) {
-//
-//		/* new function by Niklas Goby
-//		 * send the log message also to our Qt programm.
-//		 * implemented in logwriter.c
-//		 * */
-//		//logLoggerToQt(level, fmt, p);
-//
-//		if (level == LOG_DEBUG || level == LOG_INFO)
-//			f = stdout;
-//		fprintf(f, "%s, %s", leveltolog(level), logprefix);
-//		vfprintf(f, fmt, p);
-//		fputc('\n', f);
-//
-//		/* stdout, stderr may be re-directed to some kind of buffer.
-//		 * So we always flush to ensure it's written. */
-//		fflush(f);
-//	}
-//	if (level < LOG_DEBUG || level <= loglevel) {
-//		size_t len = strlen(logprefix);
-//		size_t fmt2len = strlen(fmt) + len + 1;
-//		char *fmt2 = malloc(sizeof(char) * fmt2len);
-//		char *pf = fmt2;
-//		if (fmt2) {
-//			memcpy(pf, logprefix, len);
-//			pf += len;
-//			strlcpy(pf, fmt, fmt2len - len);
-//			vsyslog(level, fmt2, p2);
-//			free(fmt2);
-//		} else {
-//			vsyslog(level, fmt, p2);
-//			syslog(LOG_ERR, "logger: memory exhausted");
-//			exit(EXIT_FAILURE);
-//		}
-//	}
-
-	//va_end (p2);
-	va_end (p);
+void logger(int level, const char *fmt, ...)
+{
+  va_list p;
+  //va_list p2;
+  //	FILE *f = stderr;
+  FILE *f;
+  FILE *f2;
+  char* path = "/tmp/cdhcpcd.log";
+  char* msgpath = "/tmp/cdhcpcd-msg.log";
+  int size = 512;
+  char *msg = (char *) malloc (size);
+
+
+  f = fopen(path, "a");
+  f2 = fopen(msgpath, "a");
+  va_start (p, fmt);
+  //va_copy (p2, p);
+
+
+  vsnprintf (msg, size, fmt, p);
+  strcat(msg, "\n");
+  logToQt(level, DHCPCD_LOG, msg);
+
+  fprintf(f2, "%s, %s", leveltolog(level), logprefix);
+  fprintf(f2, "%s", msg);
+  fputc('\n', f2);
+
+  fprintf(f, "%s, %s", leveltolog(level), logprefix);
+  vfprintf(f, fmt, p);
+  fputc('\n', f);
+
+  /* stdout, stderr may be re-directed to some kind of buffer.
+   * So we always flush to ensure it's written. */
+  fflush(f);
+
+  //	//logLoggerToQt(level, fmt, p);
+  //	if (level <= LOG_ERR || level <= loglevel) {
+  //
+  //		/* new function by Niklas Goby
+  //		 * send the log message also to our Qt programm.
+  //		 * implemented in logwriter.c
+  //		 * */
+  //		//logLoggerToQt(level, fmt, p);
+  //
+  //		if (level == LOG_DEBUG || level == LOG_INFO)
+  //			f = stdout;
+  //		fprintf(f, "%s, %s", leveltolog(level), logprefix);
+  //		vfprintf(f, fmt, p);
+  //		fputc('\n', f);
+  //
+  //		/* stdout, stderr may be re-directed to some kind of buffer.
+  //		 * So we always flush to ensure it's written. */
+  //		fflush(f);
+  //	}
+  //	if (level < LOG_DEBUG || level <= loglevel) {
+  //		size_t len = strlen(logprefix);
+  //		size_t fmt2len = strlen(fmt) + len + 1;
+  //		char *fmt2 = malloc(sizeof(char) * fmt2len);
+  //		char *pf = fmt2;
+  //		if (fmt2) {
+  //			memcpy(pf, logprefix, len);
+  //			pf += len;
+  //			strlcpy(pf, fmt, fmt2len - len);
+  //			vsyslog(level, fmt2, p2);
+  //			free(fmt2);
+  //		} else {
+  //			vsyslog(level, fmt, p2);
+  //			syslog(LOG_ERR, "logger: memory exhausted");
+  //			exit(EXIT_FAILURE);
+  //		}
+  //	}
+
+  //va_end (p2);
+  va_end (p);
 }