assert(lvalue);
assert(rvalue);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
Unit *other;
void *data,
void *userdata) {
- ExecCommand **e = data, *ee, *nce = NULL;
+ ExecCommand **e = data, *nce = NULL;
char **n;
char *w;
unsigned k;
if (!(nce->path = strdup(n[0])))
goto fail;
- if (*e) {
- /* It's kinda important that we keep the order here */
- LIST_FIND_TAIL(ExecCommand, command, *e, ee);
- LIST_INSERT_AFTER(ExecCommand, command, *e, ee, nce);
- } else
- *e = nce;
+ exec_command_append_list(e, nce);
return 0;
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
unsigned cpu;
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
if (first_word(w, "keep-caps"))
c->secure_bits |= SECURE_KEEP_CAPS;
else if (first_word(w, "keep-caps-locked"))
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
cap_value_t cap;
int r;
Set *symlink_names;
FILE *f;
- char *filename, *id;
+ char *filename = NULL, *id;
sections[0] = "Meta";
sections[1] = section_table[u->meta.type];
if (!(symlink_names = set_new(string_hash_func, string_compare_func)))
return -ENOMEM;
- /* Instead of opening the path right away, we manually
- * follow all symlinks and add their name to our unit
- * name set while doing so */
- if (!(filename = path_make_absolute(path, unit_path()))) {
- r = -ENOMEM;
- goto finish;
- }
+ if (path_is_absolute(path)) {
+
+ if (!(filename = strdup(path))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) {
+ free(filename);
+ filename = NULL;
+
+ if (r != -ENOENT)
+ goto finish;
+ }
+
+ } else {
+ char **p;
+
+ STRV_FOREACH(p, u->meta.manager->unit_path) {
- if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) {
- if (r == -ENOENT)
- r = 0; /* returning 0 means: no suitable config file found */
+ /* Instead of opening the path right away, we manually
+ * follow all symlinks and add their name to our unit
+ * name set while doing so */
+ if (!(filename = path_make_absolute(path, *p))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) {
+ char *sn;
+
+ free(filename);
+ filename = NULL;
+
+ if (r != -ENOENT)
+ goto finish;
+
+ /* Empty the symlink names for the next run */
+ while ((sn = set_steal_first(symlink_names)))
+ free(sn);
+
+ continue;
+ }
+
+ break;
+ }
+ }
+ if (!filename) {
+ r = 0; /* returning 0 means: no suitable config file found */
goto finish;
}
}
- free(u->meta.load_path);
- u->meta.load_path = filename;
+ free(u->meta.fragment_path);
+ u->meta.fragment_path = filename;
filename = NULL;
r = 1; /* returning 1 means: suitable config file found and loaded */
assert(u);
assert(u->meta.load_state == UNIT_STUB);
- if (u->meta.load_path)
- r = load_from_path(u, u->meta.load_path);
+ if (u->meta.fragment_path)
+ r = load_from_path(u, u->meta.fragment_path);
else {
Iterator i;
char *t;