"0123456789" \
"abcdefghijklmnopqrstuvwxyz" \
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
- "-_"
+ "-_.\\"
bool unit_name_is_valid(const char *n) {
UnitType t;
if (!(e = strrchr(n, '.')))
return false;
+ if (e == n)
+ return false;
+
for (i = n; i < e; i++)
if (!strchr(VALID_CHARS, *i))
return false;
return 0;
}
+int unit_choose_id(Unit *u, const char *name) {
+ char *s;
+
+ assert(u);
+ assert(name);
+
+ /* Selects one of the names of this unit as the id */
+
+ if (!(s = set_get(u->meta.names, (char*) name)))
+ return -ENOENT;
+
+ u->meta.id = s;
+ return 0;
+}
+
+int unit_set_description(Unit *u, const char *description) {
+ char *s;
+
+ assert(u);
+
+ if (!(s = strdup(description)))
+ return -ENOMEM;
+
+ free(u->meta.description);
+ u->meta.description = s;
+ return 0;
+}
+
void unit_add_to_load_queue(Unit *u) {
assert(u);
return 0;
}
-/* FIXME: Does not rollback on failure! */
+/* FIXME: Does not rollback on failure! Needs to fix special unit
+ * pointers. Needs to merge names and dependencies properly.*/
int unit_merge(Unit *u, Unit *other) {
int r;
UnitDependency d;
/* Common implementation for multiple backends */
int unit_load_fragment_and_dropin(Unit *u) {
- int r;
+ int r, ret;
assert(u);
if ((r = unit_load_fragment(u)) < 0)
return r;
+ ret = r > 0;
+
/* Load drop-in directory data */
if ((r = unit_load_dropin(u)) < 0)
return r;
- return 0;
+ return ret;
}
int unit_load(Unit *u) {
else {
assert(u->meta.job->state == JOB_RUNNING);
- /* Let's check of this state change
+ /* Let's check whether this state change
* constitutes a finished job, or maybe
* cotradicts a running job and hence needs to
* invalidate jobs. */
return 0;
}
+int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name) {
+ Unit *other;
+ int r;
+
+ if ((r = manager_load_unit(u->meta.manager, name, &other)) < 0)
+ return r;
+
+ if ((r = unit_add_dependency(u, d, other)) < 0)
+ return r;
+
+ return 0;
+}
+
const char *unit_path(void) {
char *e;
return 0;
}
+
+char *unit_name_escape_path(const char *prefix, const char *path, const char *suffix) {
+ char *r, *t;
+ const char *f;
+ size_t a, b, c;
+
+ assert(path);
+
+ /* Takes a path and a suffix and prefix and makes a nice
+ * string suitable as unit name of it, escaping all weird
+ * chars on the way.
+ *
+ * / becomes ., and all chars not alloweed in a unit name get
+ * escaped as \xFF, including \ and ., of course. This
+ * escaping is hence reversible.
+ */
+
+ if (!prefix)
+ prefix = "";
+
+ if (!suffix)
+ suffix = "";
+
+ a = strlen(prefix);
+ b = strlen(path);
+ c = strlen(suffix);
+
+ if (!(r = new(char, a+b*4+c+1)))
+ return NULL;
+
+ memcpy(r, prefix, a);
+
+ for (f = path, t = r+a; *f; f++) {
+ if (*f == '/')
+ *(t++) = '.';
+ else if (*f == '.' || *f == '\\' || !strchr(VALID_CHARS, *f)) {
+ *(t++) = '\\';
+ *(t++) = 'x';
+ *(t++) = hexchar(*f > 4);
+ *(t++) = hexchar(*f);
+ } else
+ *(t++) = *f;
+ }
+
+ memcpy(t, suffix, c+1);
+
+ return r;
+}