bidi_set_free(u, u->meta.dependencies[d]);
free(u->meta.description);
- free(u->meta.load_path);
+ free(u->meta.fragment_path);
while ((t = set_steal_first(u->meta.names)))
free(t);
prefix, yes_no(u->meta.recursive_stop),
prefix, yes_no(u->meta.stop_when_unneeded));
- if (u->meta.load_path)
- fprintf(f, "%s\tLoad Path: %s\n", prefix, u->meta.load_path);
+ if (u->meta.fragment_path)
+ fprintf(f, "%s\tFragment Path: %s\n", prefix, u->meta.fragment_path);
SET_FOREACH(t, u->meta.names, i)
fprintf(f, "%s\tName: %s\n", prefix, t);
return 0;
}
-const char *unit_path(void) {
- char *e;
-
- if ((e = getenv("UNIT_PATH")))
- if (path_is_absolute(e))
- return e;
-
- return UNIT_PATH;
-}
-
int set_unit_path(const char *p) {
char *cwd, *c;
int r;
return -ENOMEM;
}
- if (setenv("UNIT_PATH", c, 0) < 0) {
+ if (setenv("SYSTEMD_UNIT_PATH", c, 0) < 0) {
r = -errno;
free(c);
return r;
return 0;
}
-char *unit_name_escape_path(const char *prefix, const char *path, const char *suffix) {
+char *unit_name_escape_path(const char *path, const char *suffix) {
char *r, *t;
const char *f;
- size_t a, b, c;
+ size_t a, b;
assert(path);
* escaping is hence reversible.
*/
- if (!prefix)
- prefix = "";
-
if (!suffix)
suffix = "";
- a = strlen(prefix);
- b = strlen(path);
- c = strlen(suffix);
+ a = strlen(path);
+ b = strlen(suffix);
- if (!(r = new(char, a+b*4+c+1)))
+ if (!(r = new(char, a*4+b+1)))
return NULL;
- memcpy(r, prefix, a);
-
- for (f = path, t = r+a; *f; f++) {
+ for (f = path, t = r; *f; f++) {
if (*f == '/')
*(t++) = '.';
else if (*f == '.' || *f == '\\' || !strchr(VALID_CHARS, *f)) {
*(t++) = *f;
}
- memcpy(t, suffix, c+1);
+ memcpy(t, suffix, b+1);
return r;
}