moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2025-08-18 09:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autoload configuration file

Browse Source
This commit is contained in:
Iwan Timmer 2015-08-02 22:42:34 +02:00
parent 27dfda2048
commit cbdab0b35f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/config.c
View File

@ -61,8 +61,7 @@ static struct option long_options[] = {
{0, 0, 0, 0}, {0, 0, 0, 0},
}; };
char* get_path(char* name) { char* get_path(char* name, char* extra_data_dirs) {
const char *xdg_data_dirs = getenv("XDG_DATA_DIRS");
const char *xdg_config_dir = getenv("XDG_CONFIG_DIR"); const char *xdg_config_dir = getenv("XDG_CONFIG_DIR");
const char *home_dir = getenv("HOME"); const char *home_dir = getenv("HOME");
@ -70,13 +69,13 @@ char* get_path(char* name) {
return name; return name;
} }
if (!xdg_data_dirs) if (!extra_data_dirs)
xdg_data_dirs = "/usr/share:/usr/local/share"; extra_data_dirs = "/usr/share:/usr/local/share";
if (!xdg_config_dir) if (!xdg_config_dir)
xdg_config_dir = home_dir; xdg_config_dir = home_dir;
char *data_dirs = malloc(strlen(USER_PATHS) + 1 + strlen(xdg_config_dir) + 1 + strlen(home_dir) + 1 + strlen(DEFAULT_CONFIG_DIR) + 1 + strlen(xdg_data_dirs) + 2); char *data_dirs = malloc(strlen(USER_PATHS) + 1 + strlen(xdg_config_dir) + 1 + strlen(home_dir) + 1 + strlen(DEFAULT_CONFIG_DIR) + 1 + strlen(extra_data_dirs) + 2);
sprintf(data_dirs, USER_PATHS ":%s:%s/" DEFAULT_CONFIG_DIR ":%s/", xdg_config_dir, home_dir, xdg_data_dirs); sprintf(data_dirs, USER_PATHS ":%s:%s/" DEFAULT_CONFIG_DIR ":%s/", xdg_config_dir, home_dir, extra_data_dirs);
char *path = malloc(strlen(data_dirs)+strlen(MOONLIGHT_PATH)+strlen(name)+2); char *path = malloc(strlen(data_dirs)+strlen(MOONLIGHT_PATH)+strlen(name)+2);
if (path == NULL) { if (path == NULL) {
@ -147,7 +146,7 @@ static void parse_argument(int c, char* value, PCONFIGURATION config) {
mapped = true; mapped = true;
break; break;
case 'k': case 'k':
config->mapping = get_path(value); config->mapping = get_path(value, getenv("XDG_DATA_DIRS"));
if (config->mapping == NULL) { if (config->mapping == NULL) {
fprintf(stderr, "Unable to open custom mapping file: %s\n", value); fprintf(stderr, "Unable to open custom mapping file: %s\n", value);
exit(-1); exit(-1);
@ -257,7 +256,12 @@ void config_parse(int argc, char* argv[], PCONFIGURATION config) {
config->localaudio = false; config->localaudio = false;
config->inputsCount = 0; config->inputsCount = 0;
config->mapping = get_path("mappings/default.conf"); config->mapping = get_path("mappings/default.conf", getenv("XDG_DATA_DIRS"));
config->key_dir[0] = 0;
char* config_file = get_path("moonlight.conf", "/etc");
if (config_file)
config_file_parse(config_file, config);
if (argc == 2 && access(argv[1], F_OK) == 0) { if (argc == 2 && access(argv[1], F_OK) == 0) {
config->action = "stream"; config->action = "stream";