chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yay, we can start socket units
[elogind.git]
/
conf-parser.c
diff --git
a/conf-parser.c
b/conf-parser.c
index 2ea6911257db25ab302c5af7b20ffee3dfbeea9b..2f013e3f24c26f19a76aa7d1ec7b1d220cfbdf07 100644
(file)
--- a/
conf-parser.c
+++ b/
conf-parser.c
@@
-12,7
+12,6
@@
#include "strv.h"
#include "log.h"
#include "strv.h"
#include "log.h"
-#define WHITESPACE " \t\n"
#define COMMENTS "#;\n"
#define LINE_MAX 4096
#define COMMENTS "#;\n"
#define LINE_MAX 4096
@@
-45,8
+44,8
@@
static int next_assignment(
return t->parse(filename, line, section, lvalue, rvalue, t->data, userdata);
}
return t->parse(filename, line, section, lvalue, rvalue, t->data, userdata);
}
- log_
error("[%s:%u] Unknown lvalue '%s' in section '%s'
.", filename, line, lvalue, strna(section));
- return
-EBADMSG
;
+ log_
info("[%s:%u] Unknown lvalue '%s' in section '%s'. Ignoring
.", filename, line, lvalue, strna(section));
+ return
0
;
}
/* Returns non-zero when c is contained in s */
}
/* Returns non-zero when c is contained in s */
@@
-110,7
+109,7
@@
static int parse_line(const char *filename, unsigned line, char **section, const
}
}
}
}
- r = config_parse(fn, sections, t, userdata);
+ r = config_parse(fn,
NULL,
sections, t, userdata);
free(path);
return r;
}
free(path);
return r;
}
@@
-163,19
+162,20
@@
static int parse_line(const char *filename, unsigned line, char **section, const
}
/* Go through the file and parse each line */
}
/* Go through the file and parse each line */
-int config_parse(const char *filename, const char* const * sections, const ConfigItem *t, void *userdata) {
+int config_parse(const char *filename,
FILE *f,
const char* const * sections, const ConfigItem *t, void *userdata) {
unsigned line = 0;
char *section = NULL;
unsigned line = 0;
char *section = NULL;
- FILE *f;
int r;
assert(filename);
assert(t);
int r;
assert(filename);
assert(t);
- if (!(f = fopen(filename, "re"))) {
- r = -errno;
- log_error("Failed to open configuration file '%s': %s", filename, strerror(-r));
- goto finish;
+ if (!f) {
+ if (!(f = fopen(filename, "re"))) {
+ r = -errno;
+ log_error("Failed to open configuration file '%s': %s", filename, strerror(-r));
+ goto finish;
+ }
}
while (!feof(f)) {
}
while (!feof(f)) {
@@
-337,6
+337,36
@@
int config_parse_string(
return 0;
}
return 0;
}
+int config_parse_path(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ char **s = data;
+ char *n;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ if (*rvalue != '/') {
+ log_error("[%s:%u] Not an absolute path: %s", filename, line, rvalue);
+ return -EINVAL;
+ }
+
+ if (!(n = strdup(rvalue)))
+ return -ENOMEM;
+
+ free(*s);
+ *s = n;
+
+ return 0;
+}
int config_parse_strv(
const char *filename,
int config_parse_strv(
const char *filename,
@@
-360,7
+390,7
@@
int config_parse_strv(
assert(data);
k = strv_length(*sv);
assert(data);
k = strv_length(*sv);
- FOREACH_WORD
(w, &
l, rvalue, state)
+ FOREACH_WORD
_QUOTED(w,
l, rvalue, state)
k++;
if (!(n = new(char*, k+1)))
k++;
if (!(n = new(char*, k+1)))
@@
-368,7
+398,7
@@
int config_parse_strv(
for (k = 0; (*sv)[k]; k++)
n[k] = (*sv)[k];
for (k = 0; (*sv)[k]; k++)
n[k] = (*sv)[k];
- FOREACH_WORD
(w, &
l, rvalue, state)
+ FOREACH_WORD
_QUOTED(w,
l, rvalue, state)
if (!(n[k++] = strndup(w, l)))
goto fail;
if (!(n[k++] = strndup(w, l)))
goto fail;
@@
-381,6
+411,7
@@
int config_parse_strv(
fail:
for (; k > 0; k--)
free(n[k-1]);
fail:
for (; k > 0; k--)
free(n[k-1]);
+ free(n);
return -ENOMEM;
}
return -ENOMEM;
}