X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=ddfe680cebc63dc1c7af89fde333c665873765eb;hp=20cdc6ae605a99f56f35bf41f0abeff7d508936d;hb=7f08e8b0eb9570f1eb787dbb4e10d56585b36bbf;hpb=21c6e0b09b42e61e72b741bd726856ab0bcd1d64

diff --git a/daemon.c b/daemon.c
index 20cdc6ae..ddfe680c 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file daemon.c Some helpers for programs that detach from the console. */
 
@@ -34,6 +30,7 @@ struct daemon {
 	char *hostname;
 	/** Used for colored log messages. */
 	char log_colors[NUM_LOGLEVELS][COLOR_MAXLEN];
+	char *old_cwd;
 };
 
 static struct daemon the_daemon, *me = &the_daemon;
@@ -121,7 +118,12 @@ void daemon_set_logfile(const char *logfile_name)
 {
 	free(me->logfile_name);
 	me->logfile_name = NULL;
-	if (logfile_name)
+	if (!logfile_name)
+		return;
+	if (me->old_cwd && logfile_name[0] != '/')
+		me->logfile_name = make_message("%s/%s", me->old_cwd,
+			logfile_name);
+	else
 		me->logfile_name = para_strdup(logfile_name);
 }
 
@@ -201,6 +203,7 @@ int daemonize(bool parent_waits)
 	/* become session leader */
 	if (setsid() < 0)
 		goto err;
+	me->old_cwd = getcwd(NULL, 0);
 	if (chdir("/") < 0)
 		goto err;
 	null = open("/dev/null", O_RDWR);
@@ -238,15 +241,18 @@ void daemon_close_log(void)
  */
 void daemon_open_log_or_die(void)
 {
-	daemon_close_log();
+	FILE *new_log;
+
 	if (!me->logfile_name)
 		return;
-	me->logfile = fopen(me->logfile_name, "a");
-	if (!me->logfile) {
+	new_log = fopen(me->logfile_name, "a");
+	if (!new_log) {
 		PARA_EMERG_LOG("can not open %s: %s\n", me->logfile_name,
 			strerror(errno));
 		exit(EXIT_FAILURE);
 	}
+	daemon_close_log();
+	me->logfile = new_log;
 	/* equivalent to setlinebuf(), but portable */
 	setvbuf(me->logfile, NULL, _IOLBF, 0);
 }
@@ -374,8 +380,6 @@ time_t daemon_get_uptime(const struct timeval *current_time)
  * \param current_time See a \ref daemon_get_uptime().
  *
  * \return A dynamically allocated string of the form "days:hours:minutes".
- *
- * \sa server_uptime.
  */
 __malloc char *daemon_get_uptime_str(const struct timeval *current_time)
 {