Cleanup: redo configuration file handling and dependency tracking.

Implement clean configuration reload on SIGHUP.
Use SIGUSR1 to restart the program (previously initiated by SIGHUP).

* src/Makefile.am (pies_SOURCES): Add comp.c
* src/comp.c: New file.
* src/acl.c (pies_acl_free): Don't coredump on NULL arg.
(_parse_from): Set cmp function for the sockaddr list.
(_acl_common_section_parser): Set cmp function for the ACL
(pies_acl_cmp): New function.
* src/acl.h (pies_acl_cmp): New proto.
* src/cmdline.opt: Remove option --dump-prereq. Add options
--trace-prereq and --trace-depend.
* src/ctl.c: Use prog_tag to access tag of struct prog.
* src/depmap.c (depmap_clear)
(depmap_clear_all): New functions.
* src/inetd.c (inetd_conf_file): Don't register prog right
away.  This is done later in component_config_commit.
(inetd_parse_conf): Rename to inetd_config_parse.
* src/limits.c (limits_cmp): New function.
* src/pies.c (config_file): Replace with struct config_syntax.
(str_to_config_syntax): Return a pointer to struct config_syntax.
(add_config): Rename to config_file_add.
(config_file_add_type): New function.
(return_code_keywords, create_action): Change handling of actions.
(return_code_section_parser): Likewise.
(component_verify, component_create)
(component_free, component_finish): Move to comp.c
(config_parse): Remove.
(pies_config_parse): New function.
(pies_read_config,pies_reload): New function.
(pies_reload): Rename to request_reload.
(pies_status): Rename to request_status.
(pies_stop): Rename to request_stop.
(main): Change configuration file handling.
SIGHUP reloads configuration, instead of restarting the program.
(default_sigv,sig_handler): Handle SIGUSR1.
* src/pies.h (component): New members: prev, next, listidx, arridx,
ref_count, prog.
Remove act_head, act_tail, act_temp.
Add new prototypes.
* src/prog.h (prog): Remove tag and prereq.
* src/progman.c (prog_tag): New function.
(destroy_prog): Update component reference count.
(register_redir): Likewise.
(register_prog0): Take one argument.
Update component reference count.
(register_prog): Update comp->prog
(prog_rebuild_prerequisites): Remove.
(component_fixup_depend): Remove.
(fixup_prerequisites,rebuild_prerequisites)
(print_dep,progman_dump_prereq)
(progman_dump_depmap,progman_build_depmap): Remove.
(prog_start_prerequisites): Scan depmap to find prerequisites.
(prog_stop_dependents): Likewise.
(progman_wait): Remove.
(progman_wait_until): New function.
(progman_stop): Rewrite using progman_wait_until.
(react): Rewrite using grecs_list
* src/sysvinit.c: Use prog_tag when needed.
* src/userprivs.c (pies_privs_cmp, pies_privs_free): New functions.

* grecs: Update.

* lib/safe_strcmp.c: New file.
* lib/Makefile.am: Add safe_strcmp.c
* lib/libpies.h (safe_strcmp): New proto.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/prog.h b/src/prog.h
index 6590d4e..a29de04 100644
--- a/src/prog.h
+++ b/src/prog.h
@@ -46,8 +46,6 @@ struct prog
   struct prog *next, *prev;
   enum prog_type type;
   pid_t pid;             /* PID */
-  char *tag;             /* Entry tag (for diagnostics purposes) */
-  char **prereq;
   int facility;
   union
   {
@@ -60,7 +58,6 @@ struct prog
       time_t timestamp;        /* Time of last startup */
       size_t failcount;        /* Number of failed starts since timestamp */
       enum prog_status status; /* Current component status */
-      char *runlevels;
       /* If status == status_listener: */
       size_t num_instances;    /* Number of running instances */
       /* If comp->type == pies_comp_inetd && status == status_enabled */
@@ -72,11 +69,13 @@ struct prog
     
     struct
     {
+      char *tag;
       struct prog *master;
     } r;
 
     struct
     {
+      char *tag;
       char *command;
     } c;
   } v;
@@ -88,3 +87,5 @@ struct prog *progman_locate (const char *name);
 void progman_foreach (int (*filter) (struct prog *, void *data), void *data);
 void prog_stop (struct prog *prog, int sig);
 void progman_stop_component (struct prog *prog);
+
+char const *prog_tag (struct prog const *prog);