X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=ce355394baec00373c7ec3ba6d89896f6f10b347;hb=39c440444ff38c0e1702209c67cf018b92c71882;hp=c10ea67135d785c86882d3d72cefa13d7e024018;hpb=569a0db79c00169e15d5abed2a82f28d1b2391c4;p=lackey diff --git a/src/main.c b/src/main.c index c10ea67..ce35539 100644 --- a/src/main.c +++ b/src/main.c @@ -18,6 +18,7 @@ #include #include +#include "args.h" #include "util.h" #include "conf.h" #include "date.h" @@ -27,8 +28,9 @@ /* Config parser */ static void on_config(const char *group, const char *name, const char *key, const char *value) { - view_config(group, name, key, value); + date_config(group, name, key, value); cal_config(group, name, key, value); + view_config(group, name, key, value); } /* Control-C handler, so we don't hose the therminal */ @@ -45,14 +47,19 @@ int main(int argc, char **argv) signal(SIGINT, on_sigint); /* Configuration */ - conf_setup(argc, argv, ".lackeyrc", on_config); + args_setup(argc, argv); + conf_setup(".lackeyrc", on_config); /* Initialize */ + args_init(); util_init(); conf_init(); date_init(); cal_init(); + /* Run args main */ + args_main(); + /* Run view main */ view_init(); view_main();