X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincctl.c;fp=src%2Ftincctl.c;h=2ed286a62d95881ede05da7ddd97e0c7dd7433f7;hp=46073b3aaad7db9651c077a7dbc5734caaa47d9d;hb=9235256116574927657a93944ef1b21e255e771b;hpb=c6a15e27d934e90a1f3a26438dddb395bdc9de19 diff --git a/src/tincctl.c b/src/tincctl.c index 46073b3a..2ed286a6 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -44,6 +44,7 @@ #include "sandbox.h" #include "pidfile.h" #include "console.h" +#include "fs.h" #ifndef MSG_NOSIGNAL #define MSG_NOSIGNAL 0 @@ -2189,49 +2190,6 @@ int check_port(const char *name) { return 0; } -static bool makedir(const char *path, mode_t mode) { - if(mkdir(path, mode) && errno != EEXIST) { - fprintf(stderr, "Could not create directory %s: %s\n", path, strerror(errno)); - return false; - } - - return true; -} - -bool makedirs(tincd_dir_t dirs) { - if(dirs & DIR_CONFBASE && !makedir(confbase, 0777)) { - return false; - } - - if(dirs & DIR_CONFDIR && !confbase_given && !makedir(confdir, 0755)) { - return false; - } - - if(dirs & DIR_HOSTS && !makedir(hosts_dir, 0777)) { - return false; - } - - char path[PATH_MAX]; - - if(dirs & DIR_INVITATIONS) { - snprintf(path, sizeof(path), "%s" SLASH "invitations", confbase); - - if(!makedir(path, 0700)) { - return false; - } - } - - if(dirs & DIR_CACHE) { - snprintf(path, sizeof(path), "%s" SLASH "%s", confbase, "cache"); - - if(!makedir(path, 0755)) { - return false; - } - } - - return true; -} - static int cmd_init(int argc, char *argv[]) { if(!access(tinc_conf, F_OK)) { fprintf(stderr, "Configuration file %s already exists!\n", tinc_conf);