X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=unit.c;h=c8a6f669615f309506574d21d9c89181b0dc9aba;hb=fb624d04e56018defe297eff1d88888b192caeaa;hp=a5f4ac76767d1c412db7d166b7d62a3559d860d3;hpb=09b6b09f44b36b52b8a20ba18446e3ec2926c110;p=elogind.git

diff --git a/unit.c b/unit.c
index a5f4ac767..c8a6f6696 100644
--- a/unit.c
+++ b/unit.c
@@ -44,7 +44,7 @@ UnitType unit_name_to_type(const char *n) {
         "0123456789"                            \
         "abcdefghijklmnopqrstuvwxyz"            \
         "ABCDEFGHIJKLMNOPQRSTUVWXYZ"            \
-        "-_"
+        "-_.\\"
 
 bool unit_name_is_valid(const char *n) {
         UnitType t;
@@ -887,3 +887,42 @@ int set_unit_path(const char *p) {
 
         return 0;
 }
+
+char *unit_name_escape_path(const char *path, const char *suffix) {
+        char *r, *t;
+        const char *f;
+        size_t a, b;
+
+        assert(path);
+        assert(suffix);
+
+        /* Takes a path and a util suffix and makes a nice 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 the _ and the \ itself, of
+         * course. This escaping is hence reversible.
+         */
+
+        a = strlen(path);
+        b = strlen(suffix);
+
+        if (!(r = new(char, a*4+b+1)))
+                return NULL;
+
+        for (f = path, t = r; *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, b+1);
+
+        return r;
+}