X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=b7a0a3267b68df5b020159f90c56337073463244;hp=cae63ea7f48488124085d79360458ee44b5620a8;hb=28ea59db9b3cd2bd9d6be0f304d951aa550ea4d6;hpb=002731cd3938f3be6b71651e56c062af1adcdec0;ds=sidebyside

diff --git a/daemon.c b/daemon.c
index cae63ea7..b7a0a326 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1,16 +1,20 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file daemon.c Some helpers for programs that detach from the console. */
-#include "para.h"
-#include "daemon.h"
+
+#include <regex.h>
 #include <pwd.h>
 #include <sys/types.h> /* getgrnam() */
 #include <grp.h>
+#include <sys/time.h>
+#include <stdbool.h>
 
+#include "para.h"
+#include "daemon.h"
 #include "string.h"
 #include "color.h"
 
@@ -52,10 +56,8 @@ void daemon_set_default_log_colors(void)
 		[LL_CRIT] = "magenta bold",
 		[LL_EMERG] = "red bold",
 	};
-	for (i = 0; i < NUM_LOGLEVELS; i++) {
-		int ret = color_parse(default_log_colors[i], me->log_colors[i]);
-		assert(ret >= 0);
-	}
+	for (i = 0; i < NUM_LOGLEVELS; i++)
+		color_parse_or_die(default_log_colors[i], me->log_colors[i]);
 }
 
 /**
@@ -67,7 +69,7 @@ void daemon_set_default_log_colors(void)
  *
  * \return 1 On success, -1 on errors.
  */
-int daemon_set_log_color(char const *arg)
+void daemon_set_log_color_or_die(char const *arg)
 {
 	char *p = strchr(arg, ':');
 	int ret, ll;
@@ -79,14 +81,11 @@ int daemon_set_log_color(char const *arg)
 		goto err;
 	ll = ret;
 	p++;
-	ret = color_parse(p, me->log_colors[ll]);
-	if (ret < 0)
-		goto err;
-	return 1;
+	color_parse_or_die(p, me->log_colors[ll]);
+	return;
 err:
-	PARA_ERROR_LOG("%s: color syntax error\n", arg);
-	return -1;
-
+	PARA_EMERG_LOG("%s: color syntax error\n", arg);
+	exit(EXIT_FAILURE);
 }
 
 /**
@@ -103,7 +102,7 @@ void daemon_set_logfile(char *logfile_name)
 }
 
 /**
- * Supress log messages with severity lower than the given loglevel.
+ * Suppress log messages with severity lower than the given loglevel.
  *
  * \param loglevel The smallest level that should be logged.
  */
@@ -139,7 +138,7 @@ void daemon_clear_flag(unsigned flag)
 	me->flags &= ~flag;
 }
 
-static unsigned daemon_test_flag(unsigned flag)
+static bool daemon_test_flag(unsigned flag)
 {
 	return me->flags & flag;
 }
@@ -167,7 +166,6 @@ void daemonize(void)
 		goto err;
 	if (chdir("/") < 0)
 		goto err;
-	umask(0);
 	null = open("/dev/null", O_RDONLY);
 	if (null < 0)
 		goto err;
@@ -270,7 +268,11 @@ void drop_privileges_or_die(const char *username, const char *groupname)
 		exit(EXIT_FAILURE);
 	}
 	PARA_INFO_LOG("dropping root privileges\n");
-	setuid(p->pw_uid);
+	if (setuid(p->pw_uid) < 0) {
+		PARA_EMERG_LOG("failed to set effective user ID (%s)",
+			strerror(errno));
+		exit(EXIT_FAILURE);
+	}
 	PARA_DEBUG_LOG("uid: %d, euid: %d\n", (int)getuid(), (int)geteuid());
 }
 
@@ -284,7 +286,7 @@ void drop_privileges_or_die(const char *username, const char *groupname)
  * set_or_get equal to \p UPTIME_GET return the uptime.
 
  * \return Zero if called with \a set_or_get equal to \p UPTIME_SET, the number
- * of seconds ellapsed since the last reset otherwise.
+ * of seconds elapsed since the last reset otherwise.
  *
  * \sa time(2), difftime(3).
  */
@@ -327,8 +329,9 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
 	va_list argp;
 	FILE *fp;
 	struct tm *tm;
-	time_t t1;
-	char *color, str[MAXLINE] = "";
+	char *color;
+	bool log_time = daemon_test_flag(DF_LOG_TIME), log_timing =
+		daemon_test_flag(DF_LOG_TIMING);
 
 	ll = PARA_MIN(ll, NUM_LOGLEVELS - 1);
 	ll = PARA_MAX(ll, LL_DEBUG);
@@ -339,12 +342,18 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
 	color = daemon_test_flag(DF_COLOR_LOG)? me->log_colors[ll] : NULL;
 	if (color)
 		fprintf(fp, "%s", color);
-	if (daemon_test_flag(DF_LOG_TIME)) {
-		/* date and time */
-		time(&t1);
-		tm = localtime(&t1);
-		strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
-		fprintf(fp, "%s ", str);
+	if (log_time || log_timing) {
+		struct timeval tv;
+		gettimeofday(&tv, NULL);
+		if (daemon_test_flag(DF_LOG_TIME)) { /* print date and time */
+			time_t t1 = tv.tv_sec;
+			char str[100];
+			tm = localtime(&t1);
+			strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
+			fprintf(fp, "%s%s", str, log_timing? ":" : " ");
+		}
+		if (log_timing) /* print milliseconds */
+			fprintf(fp, "%04lu ", (long unsigned)tv.tv_usec / 1000);
 	}
 	if (daemon_test_flag(DF_LOG_HOSTNAME)) {
 		if (!me->hostname)