Skip to content

added environment variable expansion in config file #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sergey-safarov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added environment variable expansion in config file #539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 51 additions & 3 deletions src/setting.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,46 @@
#include "setting.h"
#include "util.h"

static void
setting_expand_env_macros(const char *value, char *expanded, size_t expanded_size)
{
const char *cursor = value;
size_t exp_len = 0;

if (!value || !expanded || expanded_size == 0)
return;

expanded[0] = '\0';

while (*cursor && exp_len < expanded_size - 1) {
if (cursor[0] == '$' && cursor[1] == '{') {
const char *macro_start = cursor + 2;
const char *macro_end = strchr(macro_start, '}');
if (macro_end) {
char macro_name[128];
const char *macro_value;
size_t macro_name_len = macro_end - macro_start;

if (macro_name_len > 0 && macro_name_len < sizeof(macro_name)) {
memcpy(macro_name, macro_start, macro_name_len);
macro_name[macro_name_len] = '\0';
macro_value = getenv(macro_name);
if (macro_value && *macro_value) {
while (*macro_value && exp_len < expanded_size - 1)
expanded[exp_len++] = *macro_value++;
}
cursor = macro_end + 1;
continue;
}
}
}

expanded[exp_len++] = *cursor++;
}

expanded[exp_len] = '\0';
}


//! Available configurable settings
setting_t settings[SETTING_COUNT] = {
Expand Down Expand Up @@ -168,11 +208,19 @@ void
setting_set_value(int id, const char *value)
{
setting_t *sett = setting_by_id(id);
const char *setting_value = value;
char expanded_value[MAX_SETTING_LEN];

if (sett && sett->id == SETTING_SAVEPATH && value && strstr(value, "${")) {
setting_expand_env_macros(value, expanded_value, sizeof(expanded_value));
setting_value = expanded_value;
}

if (sett) {
memset(sett->value, 0, sizeof(sett->value));
if (value) {
if (strlen(value) < MAX_SETTING_LEN) {
strcpy(sett->value, value);
if (setting_value) {
if (strlen(setting_value) < MAX_SETTING_LEN) {
strcpy(sett->value, setting_value);
} else {
fprintf(stderr, "Setting value %s for %s is too long\n", sett->value, sett->name);
exit(1);
Expand Down