chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: creds - ignore EINVAL when acessing the (inactive) LSM /proc interface
[elogind.git]
/
src
/
shared
/
conf-parser.c
diff --git
a/src/shared/conf-parser.c
b/src/shared/conf-parser.c
index efd2147e798acc86ddb8ce65e1015d77f758e465..1e3cee5bebc4c21c97f161bda15e8201650fb4a4 100644
(file)
--- a/
src/shared/conf-parser.c
+++ b/
src/shared/conf-parser.c
@@
-156,6
+156,7
@@
static int next_assignment(const char *unit,
ConfigItemLookup lookup,
void *table,
const char *section,
ConfigItemLookup lookup,
void *table,
const char *section,
+ unsigned section_line,
const char *lvalue,
const char *rvalue,
bool relaxed,
const char *lvalue,
const char *rvalue,
bool relaxed,
@@
-178,8
+179,8
@@
static int next_assignment(const char *unit,
if (r > 0) {
if (func)
if (r > 0) {
if (func)
- return func(unit, filename, line, section,
lvalue, ltyp
e,
- rvalue, data, userdata);
+ return func(unit, filename, line, section,
section_lin
e,
+
lvalue, ltype,
rvalue, data, userdata);
return 0;
}
return 0;
}
@@
-202,6
+203,7
@@
static int parse_line(const char* unit,
bool relaxed,
bool allow_include,
char **section,
bool relaxed,
bool allow_include,
char **section,
+ unsigned *section_line,
char *l,
void *userdata) {
char *l,
void *userdata) {
@@
-260,10
+262,13
@@
static int parse_line(const char* unit,
"Unknown section '%s'. Ignoring.", n);
free(n);
"Unknown section '%s'. Ignoring.", n);
free(n);
+ free(*section);
*section = NULL;
*section = NULL;
+ *section_line = 0;
} else {
free(*section);
*section = n;
} else {
free(*section);
*section = n;
+ *section_line = line;
}
return 0;
}
return 0;
@@
-293,6
+298,7
@@
static int parse_line(const char* unit,
lookup,
table,
*section,
lookup,
table,
*section,
+ *section_line,
strstrip(l),
strstrip(e),
relaxed,
strstrip(l),
strstrip(e),
relaxed,
@@
-312,7
+318,7
@@
int config_parse(const char *unit,
_cleanup_free_ char *section = NULL, *continuation = NULL;
_cleanup_fclose_ FILE *ours = NULL;
_cleanup_free_ char *section = NULL, *continuation = NULL;
_cleanup_fclose_ FILE *ours = NULL;
- unsigned line = 0;
+ unsigned line = 0
, section_line = 0
;
int r;
assert(filename);
int r;
assert(filename);
@@
-381,6
+387,7
@@
int config_parse(const char *unit,
relaxed,
allow_include,
§ion,
relaxed,
allow_include,
§ion,
+ §ion_line,
p,
userdata);
free(c);
p,
userdata);
free(c);
@@
-397,6
+404,7
@@
int config_parse(const char *unit,
const char *filename, \
unsigned line, \
const char *section, \
const char *filename, \
unsigned line, \
const char *section, \
+ unsigned section_line, \
const char *lvalue, \
int ltype, \
const char *rvalue, \
const char *lvalue, \
int ltype, \
const char *rvalue, \
@@
-433,6
+441,7
@@
int config_parse_bytes_size(const char* unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-464,6
+473,7
@@
int config_parse_bytes_off(const char* unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-492,6
+502,7
@@
int config_parse_bool(const char* unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-521,6
+532,7
@@
int config_parse_string(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-561,6
+573,7
@@
int config_parse_path(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-606,6
+619,7
@@
int config_parse_strv(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-662,6
+676,7
@@
int config_parse_path_strv(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-719,6
+734,7
@@
int config_parse_mode(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-756,6
+772,7
@@
int config_parse_facility(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-786,6
+803,7
@@
int config_parse_level(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-815,6
+833,7
@@
int config_parse_set_status(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,