commit 5954ecb87b8c77425d8cc766c0cc798957a07a7d
author Colin Cross <ccross@android.com> Mon Jul 22 22:39:37 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 22 22:39:37 2013 +0000
tree 5583577f07d49f85edfeb353111fac411c42fd8d
parent 596ee9ea8ae37b17fbdff91508f55250d528f1d2
parent 93ca79b44535ee24ece08001e1948070db6ab6ed

Merge "Allow more characters in partition name links"

init/devices.c

diff --git a/init/devices.c b/init/devices.c
index 69f5fc8..41ab85e 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -451,6 +451,8 @@
     if (uevent->partition_name) {
         p = strdup(uevent->partition_name);
         sanitize(p);
+        if (strcmp(uevent->partition_name, p))
+            NOTICE("Linking partition '%s' as '%s'\n", uevent->partition_name, p);
         if (asprintf(&links[link_num], "%s/by-name/%s", link_path, p) > 0)
             link_num++;
         else

init/util.c

diff --git a/init/util.c b/init/util.c
index 918bc05..76af9e5 100755
--- a/init/util.c
+++ b/init/util.c
@@ -305,14 +305,27 @@
     return 0;
 }
 
+/*
+ * replaces any unacceptable characters with '_', the
+ * length of the resulting string is equal to the input string
+ */
 void sanitize(char *s)
 {
+    const char* accept =
+            "abcdefghijklmnopqrstuvwxyz"
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            "0123456789"
+            "_-.";
+
     if (!s)
         return;
-    while (isalnum(*s))
-        s++;
-    *s = 0;
+
+    for (; *s; s++) {
+        s += strspn(s, accept);
+        if (*s) *s = '_';
+    }
 }
+
 void make_link(const char *oldpath, const char *newpath)
 {
     int ret;