X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.h;h=b530b0d76b48b673fd7ae7626c48a6dd91ab7751;hp=3705b9da27cc9db1892fb06c5b64cdcd273702da;hb=f932f45196a8a4480ad910c455abe8aae9824967;hpb=e90440367f744a7723b201a95888e66f070ffa92

diff --git a/daemon.h b/daemon.h
index 3705b9da..b530b0d7 100644
--- a/daemon.h
+++ b/daemon.h
@@ -1,21 +1,23 @@
 /** \file daemon.h exported symbols from daemon.c */
 
 
-void daemonize(void);
+int daemonize(bool parent_waits);
 void daemon_open_log_or_die(void);
 void daemon_close_log(void);
-void log_welcome(const char *whoami);
-void drop_privileges_or_die(const char *username, const char *groupname);
-/** used for server_uptime() */
-enum uptime {UPTIME_SET, UPTIME_GET};
-time_t server_uptime(enum uptime set_or_get);
-__malloc char *uptime_str(void);
-void daemon_set_logfile(char *logfile_name);
+void daemon_log_welcome(const char *whoami);
+void daemon_set_priority(int prio);
+void daemon_drop_privileges_or_die(const char *username, const char *groupname);
+void daemon_set_start_time(void);
+time_t daemon_get_uptime(const struct timeval *current_time);
+__malloc char *daemon_get_uptime_str(const struct timeval *current_time);
+void daemon_set_logfile(const char *logfile_name);
+void daemon_set_hooks(void (*pre_log_hook)(void), void (*post_log_hook)(void));
 void daemon_set_flag(unsigned flag);
-void daemon_clear_flag(unsigned flag);
-void daemon_set_loglevel(char *loglevel);
-void daemon_set_default_log_colors(void);
-int daemon_set_log_color(char const *arg);
+void daemon_set_loglevel(const char *loglevel);
+bool daemon_init_colors_or_die(int color_arg, int color_arg_auto,
+		int color_arg_no, bool logfile_given);
+void daemon_set_log_color_or_die(const char *arg);
+__printf_2_3 void daemon_log(int ll, const char* fmt,...);
 
 /** Daemon log configuration flags. */
 enum daemon_flags {