X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=eef504f1b972f20b9a8b5aa22d0efc0ae80f1396;hp=7f4aa6f528ef20b49f6dcd5234798db072436b6c;hb=d5538ff0dd9f6531a1a319b49c32bd72597fb2c3;hpb=8ea8abb73199b32fdd7afdf8825afa42ed8de244

diff --git a/daemon.c b/daemon.c
index 7f4aa6f5..eef504f1 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -10,6 +10,8 @@
 #include <pwd.h>
 #include <sys/types.h> /* getgrnam() */
 #include <grp.h>
+#include <sys/time.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "daemon.h"
@@ -105,7 +107,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.
  */
@@ -141,7 +143,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;
 }
@@ -169,7 +171,6 @@ void daemonize(void)
 		goto err;
 	if (chdir("/") < 0)
 		goto err;
-	umask(0);
 	null = open("/dev/null", O_RDONLY);
 	if (null < 0)
 		goto err;
@@ -272,7 +273,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());
 }
 
@@ -286,7 +291,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).
  */
@@ -329,8 +334,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);
@@ -341,12 +347,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)