wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-29 12:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: new function conf_parse_env()

Browse Source 
Reduce code duplication.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2025-07-02 14:28:27 +02:00
1 parent 6f0ba22a0f
commit 33f6697cd5
3 files changed
+35 -60
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/service.c
+6 -52
View File
@@ -425,11 +425,13 @@ static void source_env(svc_t *svc)
line = buf;
while (fgets(line, LINE_SIZE, fp)) {
char *key = chomp(line);
wordexp_t we = { 0 };
char *value, *end;
char *key, *value;
size_t i;
/* Trim newline */
key = chomp(line);
/* skip any leading whitespace */
while (isspace(*key))
key++;
@@ -438,57 +440,9 @@ static void source_env(svc_t *svc)
if (*key == '#' || *key == ';')
continue;
/* find end of line */
end = key;
while (*end)
end++;
/* strip trailing whitespace */
if (end > key) {
end--;
while (isspace(*end))
*end-- = 0;
}
value = strchr(key, '=');
if (!value)
key = conf_parse_env(key, &value);
if (!key)
continue;
*value++ = 0;
/* strip leading whitespace from value */
while (isspace(*value))
value++;
/* unquote value, if quoted */
unquote(&value, end);
/* find end of key */
end = key;
while (*end)
end++;
/* strip trailing whitespace */
if (end > key) {
end--;
while (isspace(*end))
*end-- = 0;
}
/* strip any leading 'set ' */
end = key;
if (!strncmp(key, "set", 3))
end += 3;
/* check key, no spaces allowed */
while (*end && isspace(*end))
end++;
key = end;
while (*end && !isspace(*end))
end++;
if (*end != 0) {
warnx("'%s=%s': not a valid identifier", key, value);
continue; /* invalid key */
}
if (wordexp(value, &we, 0)) {
setenv(key, value, 1);