mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2025-12-21 03:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Alloc passing the path to the configuration file as an argument (#134)

Browse Source 
Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
This commit is contained in:
Roosemberth Palacios
2019-10-31 13:54:45 +01:00
committed by nullgemm
parent f650e82f93
commit 31e1ba84af
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.c
View File

@@ -16,7 +16,7 @@
#include <unistd.h>
#include <stdlib.h>
#define ARG_COUNT 5
#define ARG_COUNT 7
// things you can define:
// GIT_VERSION_STRING
// RUNIT
@@ -61,6 +61,11 @@ void log_init(char** log)
log[DGN_HOSTNAME] = lang.err_hostname;
}
void arg_config(void* data, char** pars, const int pars_count)
{
*((char **)data) = *pars;
}
// ly!
int main(int argc, char** argv)
{
@@ -71,17 +76,18 @@ int main(int argc, char** argv)
config_defaults();
lang_defaults();
config_load();
if (strcmp(config.lang, "en") != 0)
{
lang_load();
}
char *config_path = NULL;
// parse args
const struct argoat_sprig sprigs[ARG_COUNT] =
{
{NULL, 0, NULL, NULL},
{"config", 0, &config_path, arg_config},
{"c", 0, &config_path, arg_config},
{"help", 0, NULL, arg_help},
{"h", 0, NULL, arg_help},
{"version", 0, NULL, arg_version},
@@ -106,6 +112,8 @@ int main(int argc, char** argv)
return 1;
}
config_load(config_path);
void* input_structs[3] =
{
(void*) &desktop,