chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: use quoted word parsing where applicable
[elogind.git]
/
src
/
load-fragment.c
diff --git
a/src/load-fragment.c
b/src/load-fragment.c
index 591b73d01b8de8f0e8b2abbce890d2de10be9e7a..43b8093fa02e782dad11d983a7c9115440585ab5 100644
(file)
--- a/
src/load-fragment.c
+++ b/
src/load-fragment.c
@@
-41,7
+41,6
@@
#include "unit-name.h"
#define COMMENTS "#;\n"
#include "unit-name.h"
#define COMMENTS "#;\n"
-#define LINE_MAX 4096
static int config_parse_deps(
const char *filename,
static int config_parse_deps(
const char *filename,
@@
-62,7
+61,7
@@
static int config_parse_deps(
assert(lvalue);
assert(rvalue);
assert(lvalue);
assert(rvalue);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD
_QUOTED
(w, l, rvalue, state) {
char *t, *k;
int r;
char *t, *k;
int r;
@@
-104,7
+103,7
@@
static int config_parse_names(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD
_QUOTED
(w, l, rvalue, state) {
char *t, *k;
int r;
char *t, *k;
int r;
@@
-690,7
+689,7
@@
static int config_parse_cpu_affinity(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD
_QUOTED
(w, l, rvalue, state) {
char *t;
int r;
unsigned cpu;
char *t;
int r;
unsigned cpu;
@@
-767,7
+766,7
@@
static int config_parse_secure_bits(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD
_QUOTED
(w, l, rvalue, state) {
if (first_word(w, "keep-caps"))
c->secure_bits |= SECURE_KEEP_CAPS;
else if (first_word(w, "keep-caps-locked"))
if (first_word(w, "keep-caps"))
c->secure_bits |= SECURE_KEEP_CAPS;
else if (first_word(w, "keep-caps-locked"))
@@
-808,7
+807,7
@@
static int config_parse_bounding_set(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD
_QUOTED
(w, l, rvalue, state) {
char *t;
int r;
cap_value_t cap;
char *t;
int r;
cap_value_t cap;
@@
-903,11
+902,11
@@
static int config_parse_cgroup(
size_t l;
char *state;
size_t l;
char *state;
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD
_QUOTED
(w, l, rvalue, state) {
char *t;
int r;
char *t;
int r;
- if (!(t =
strndup
(w, l)))
+ if (!(t =
cunescape_length
(w, l)))
return -ENOMEM;
r = unit_add_cgroup_from_text(u, t);
return -ENOMEM;
r = unit_add_cgroup_from_text(u, t);
@@
-968,7
+967,7
@@
static int config_parse_mount_flags(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD
_QUOTED
(w, l, rvalue, state) {
if (strncmp(w, "shared", l) == 0)
flags |= MS_SHARED;
else if (strncmp(w, "slave", l) == 0)
if (strncmp(w, "shared", l) == 0)
flags |= MS_SHARED;
else if (strncmp(w, "slave", l) == 0)