wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-07 16:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix and document new include <CONF> syntax.

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2014-04-21 12:03:10 +02:00
1 parent 773d2e65d6
commit 10386ee4de
2 files changed
+21 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

conf.c
+15 -11
View File
@@ -94,15 +94,9 @@ static int parse_conf(char *file)
char *x;
const char *err = NULL;
/* Assume absolute path is given ... */
fp = fopen(file, "r");
if (!fp) {
/* ... if it fails, try /etc/finit.d/ as prefix */
snprintf(line, sizeof(line), "%s/%s", rcsd, file);
fp = fopen(file, "r");
if (!fp)
return 1;
}
if (!fp)
return 1;
_d("Parse %s ...", file);
while (!feof(fp)) {
@@ -169,14 +163,24 @@ static int parse_conf(char *file)
rcsd = strdup(strip_line(x));
continue;
}
/* Parse any include file, use rcsd if absolute path not given. */
/* Parse any include file, use rcsd if absolute path not given */
if (MATCH_CMD(line, "include ", x)) {
int result;
char *file = strip_line(x);
char buf[60];
snprintf(buf, sizeof(buf), "Loading include file %s", file);
strlcpy(cmd, file, sizeof(cmd));
if (!fexist(cmd)) {
/* ... try /etc/finit.d/ as prefix */
snprintf(cmd, sizeof(cmd), "%s/%s", rcsd, file);
if (!fexist(cmd))
continue;
}
snprintf(buf, sizeof(buf), "Loading include file %s", cmd);
result = parse_conf(file);
print_desc("", buf);
print_result(parse_conf(file));
print_result(result);
continue;
}
if (MATCH_CMD(line, "startx ", x)) {