From 94bc38df829c4816e629c7dcaed31b1e7c75bc4b Mon Sep 17 00:00:00 2001 From: gramanas Date: Mon, 16 Apr 2018 14:34:30 +0300 Subject: Add asan option to cmake finish init without any asan warnings --- src/actions.c | 44 ++++++++------------------------------------ 1 file changed, 8 insertions(+), 36 deletions(-) (limited to 'src/actions.c') diff --git a/src/actions.c b/src/actions.c index 881c299..71f27da 100644 --- a/src/actions.c +++ b/src/actions.c @@ -1,52 +1,24 @@ +/* actions.c - ck actions --------------------------------------*- C -*- + * + * This file is part of ck, the config keeper + * + * ------------------------------------------------------------------ */ #include -#include -#include -#include -#include #include "actions.h" #include "dblayer.h" -int init_create_config_file(UserOpt *opt) { - struct stat st = {0}; - if (stat("/home/gramanas/.ck", &st) == -1) { - mkdir("/home/gramanas/.ck", 0755); - } - - FILE *f; - if ((f = fopen("/home/gramanas/.ck/ckrc", "w")) == NULL) { - return 1; - } - char tmp[200]; - if (stat(opt->argv[0], &st) == -1) { - printf("Version control directory: %s\ndoes not exist.\n", opt->argv[0]); - return 1; - } - strcpy(tmp, "version_control_dir = "); - strcat(tmp, opt->argv[0]); - strcat(tmp, "\n"); - fputs(tmp, f); - if (stat(opt->argv[1], &st) == -1) { - printf("Secret directory: %s\ndoes not exist.\n", opt->argv[1]); - return 1; - } - strcpy(tmp, "secret_dir = "); - strcat(tmp, opt->argv[1]); - strcat(tmp, "\n"); - fputs(tmp, f); - fclose(f); - return 0; -} int run_INIT(UserOpt * opt, Conf *conf) { - if (db_exists()) { + if (db_exists(opt)) { + printf("conf dir: %s\n", opt->confDir); printf("ck is already initialized.\n"); return 0; } if (init_create_config_file(opt)) { return 0; } - DB db = init_make_DB(); + DB db = init_make_DB(opt); if (db.error == SQL_NO_ERR) { init_make_tables(&db); } -- cgit v1.2.3