=================================================================== RCS file: /cvs/cvs/blind/blind.c,v retrieving revision 1.3 retrieving revision 1.10 diff -u -p -r1.3 -r1.10 --- blind/blind.c 2022/03/15 23:31:01 1.3 +++ blind/blind.c 2022/03/19 06:29:08 1.10 @@ -17,13 +17,18 @@ #include #include #include +#include +#include #include "blind.h" +#include "config.h" +#include "log.h" static void usage(void); -int daemonize = 1; -int verbose = 0; +int daemonize = 1; +int verbose = 0; +struct blind *bl; static void usage(void) @@ -38,8 +43,8 @@ int main(int argc, char *argv[]) { int ch; - int action = 1; - const char *config = CONFIG; + int no_action = 0; + const char *config = BL_CONF; while ((ch = getopt(argc, argv, "dhnvf:")) != -1) { switch (ch) { @@ -47,11 +52,11 @@ main(int argc, char *argv[]) daemonize = 0; break; case 'h': - fprintf(stderr, BLIND_TXT " " BLIND_VER "\n"); + fprintf(stderr, BL_TEXT " " BL_VERS "\n"); usage(); break; case 'n': - action = 0; + no_action = 1; break; case 'f': config = optarg; @@ -68,6 +73,27 @@ main(int argc, char *argv[]) if (argc || *argv) usage(); + + log_init(daemonize, LOG_DAEMON); + log_setv(verbose); + log_info("%s %s starting", BL_TEXT, BL_VERS); + log_debug("verbose mode"); + + if ((bl = config_init()) == NULL) + log_fatal("default values init failed"); + + if (strlcpy(bl->bl_conf, config, PATH_MAX)>= PATH_MAX) + log_fatal("config file name exceeds PATH_MAX"); + + // conf file + + // parse config + + log_debug("conf=%s", bl->bl_conf); + log_debug("sock=%s", bl->bl_sock); + log_debug("ttl=%d", bl->bl_ttl); + + // TAILQ_INIT(&offline_queue) exit(0); }