=================================================================== RCS file: /cvs/cvs/blind/blind.c,v retrieving revision 1.7 retrieving revision 1.16 diff -u -p -r1.7 -r1.16 --- blind/blind.c 2022/03/17 21:15:43 1.7 +++ blind/blind.c 2022/03/20 22:00:51 1.16 @@ -17,17 +17,17 @@ #include #include #include +#include #include #include "blind.h" #include "config.h" #include "log.h" -static void usage(void); +static void usage(void); -int daemonize = 1; -int verbose = 0; -struct blind *bl; +int daemonize = 1; +struct blind *bl; static void usage(void) @@ -42,6 +42,7 @@ int main(int argc, char *argv[]) { int ch; + int verbose = 0; int no_action = 0; const char *config = BL_CONF; @@ -61,7 +62,7 @@ main(int argc, char *argv[]) config = optarg; break; case 'v': - verbose = 1; + verbose = BL_OPT_VERBOSE; break; default: usage(); @@ -74,21 +75,32 @@ main(int argc, char *argv[]) usage(); log_init(daemonize, LOG_DAEMON); - log_setv(verbose); - log_info("%s %s starting", BL_TEXT, BL_VERS); - log_debug("verbose mode"); + log_info("%s %s", BL_TEXT, BL_VERS); if ((bl = config_init()) == NULL) - // change from log_info to log_error/fatal - log_info("config default"); + log_fatal("initialization failed"); - log_debug("ttl=%d", bl->bl_ttl); - - // conf file format + default values + if (verbose) { + bl->bl_opt |= verbose; + log_setv(verbose); + log_debug("verbose mode on"); + } + + if (strlcpy(bl->bl_conf, config, PATH_MAX) >= PATH_MAX) + log_fatal("file name exceeds PATH_MAX"); + if (config_load(bl)) + log_fatal("config %s", bl->bl_conf); + + log_debug("conf=%s", bl->bl_conf); + log_debug("sock=%s", bl->bl_sock); + log_debug(" ttl=%d", bl->bl_ttl); + log_debug(" opt=%d", bl->bl_opt); + log_debug(" flg=%d", bl->bl_flg); + // TAILQ_INIT(&offline_queue) - // parse_config + // fork + process setup + communication setup exit(0); }