Merge branch 't/sync'

[paraslash.git] / daemon.h

diff --git a/daemon.h b/daemon.h
index 3705b9da27cc9db1892fb06c5b64cdcd273702da..fd435577e6258aa24fe2fe1edc9bde2ce50c7d5f 100644 (file)
--- a/daemon.h
+++ b/daemon.h
@@ -1,21 +1,22 @@
 /** \file daemon.h exported symbols from daemon.c */
 
 
 /** \file daemon.h exported symbols from daemon.c */
 
 

-void daemonize(void);
+void 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() */
 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 set_server_start_time(const struct timeval *startuptime);
+time_t get_server_uptime(const struct timeval *current_time);
+__malloc char *get_server_uptime_str(const struct timeval *current_time);

 void daemon_set_logfile(char *logfile_name);
 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);
 void daemon_set_logfile(char *logfile_name);
 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_log_color_or_die(char const *arg);
+__printf_2_3 void daemon_log(int ll, const char* fmt,...);

 
 /** Daemon log configuration flags. */
 enum daemon_flags {
 
 /** Daemon log configuration flags. */
 enum daemon_flags {