X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=7c625bbea9d84c5ac9b37a22253346576cbb7183;hp=945c5a39a094e8314c5667f57f0b6a8099b12b45;hb=cf47da359caca907d8f0fd8fe9f5f4ddb398b67d;hpb=67cb641c126769af98289539ff3425dfbf5e12e2

diff --git a/daemon.c b/daemon.c
index 945c5a39..7c625bbe 100644
--- a/daemon.c
+++ b/daemon.c
@@ -54,12 +54,12 @@ static void daemon_set_default_log_colors(void)
 		color_parse_or_die(default_log_colors[i], me->log_colors[i]);
 }
 
-/*
+/**
  * Set the color for one loglevel.
  *
- * arg must be of the form "ll:[fg [bg]] [attr]".
+ * \param arg Must be of the form "ll:[fg [bg]] [attr]".
  */
-static void daemon_set_log_color_or_die(char const *arg)
+void daemon_set_log_color_or_die(const char *arg)
 {
 	char *p = strchr(arg, ':');
 	int ret, ll;
@@ -85,36 +85,31 @@ err:
  * \param color_arg_auto The value for automatic color detection.
  * \param color_arg_no The value to disable colored log messages.
  * \param logfile_given In auto mode colors are disabled if this value is true.
- * \param log_color_argv Color specifiers given to --log-color.
- * \param argc Number of color specifiers in \a log_color_argv.
  *
- * If \a color_arg equals \a color_arg_no, color mode is disabled, i.e., calls
- * to \a para_log() will not produce colored output. If \a color_arg == \a
- * color_arg_auto, the function autodetects whether to activate colors.
- * Otherwise color mode is enabled.
+ * If color_arg equals color_arg_no, color mode is disabled. That is, calls to
+ * para_log() will not produce colored output. If color_arg equals
+ * color_arg_auto, the function detects automatically whether to activate
+ * colors. Otherwise color mode is enabled.
+ *
+ * If color mode is to be enabled, the default colors are set for each
+ * loglevel. They can be overwritten by calling daemon_set_log_color_or_die().
  *
- * If color mode is to be enabled, the strings in \a log_color_argv are parsed
- * and the color scheme is updated accordingly. For each loglevel, the default
- * colors apply if there is no log_color_argv for this loglevel.
+ * \return Whether colors have been enabled by the function.
  */
-void daemon_init_colors_or_die(int color_arg, int color_arg_auto,
-		int color_arg_no, bool logfile_given, char **log_color_argv,
-		int argc)
+bool daemon_init_colors_or_die(int color_arg, int color_arg_auto,
+		int color_arg_no, bool logfile_given)
 {
-	int i;
-
 	if (color_arg == color_arg_no)
-		return;
+		return false;
 	if (color_arg == color_arg_auto) {
 		if (logfile_given)
-			return;
+			return false;
 		if (!isatty(STDERR_FILENO))
-			return;
+			return false;
 	}
 	daemon_set_flag(DF_COLOR_LOG);
 	daemon_set_default_log_colors();
-	for (i = 0; i < argc; i++)
-		daemon_set_log_color_or_die(log_color_argv[i]);
+	return true;
 }
 
 /**