kbdsensor: fix parsing of input device name

Originally we use %s in sscanf to get the device name from the property.
However, %s only matches a sequence of non-white-space characters. That
means if the name contains space characters, it can't be parsed correctly.

The patch uses strsep to extract the substring before the first delimiter
as the device name.

diff --git a/kbdsensor.cpp b/kbdsensor.cpp
index 0896588..47695f5 100644 (file)
--- a/kbdsensor.cpp
+++ b/kbdsensor.cpp
@@ -85,6 +85,14 @@ struct SensorPollContext : SensorFd<sensors_poll_device_1> {
        KbdSensorKeys *ktype;
 };
 
+void parse_kbd_keys_from_prop(char *prop, KbdSensorKeys *ktype)
+{
+       strlcpy(ktype->name, strsep(&prop, ","), sizeof(ktype->name));
+       sscanf(prop, "%d,%d,%d,%d,%d,%d,%d,%d", ktype->keys,
+                       ktype->keys + 1, ktype->keys + 2, ktype->keys + 3, ktype->keys + 4, ktype->keys + 5, ktype->keys + 6, ktype->keys + 7);
+       ALOGD("[%s]: %d,%d,%d,...", ktype->name, ktype->keys[0], ktype->keys[1], ktype->keys[2]);
+}
+
 SensorPollContext::SensorPollContext(const struct hw_module_t *module, struct hw_device_t **device)
       : SensorFd<sensors_poll_device_1>(module), enabled(false), rotation(ROT_0), ktype(KeysType)
 {
@@ -100,8 +108,7 @@ SensorPollContext::SensorPollContext(const struct hw_module_t *module, struct hw
        const char *dirname = "/dev/input";
        char prop[PROPERTY_VALUE_MAX];
        if (property_get("hal.sensors.kbd.keys", prop, 0))
-               sscanf(prop, "%s,%d,%d,%d,%d,%d,%d,%d,%d", ktype->name, ktype->keys,
-                               ktype->keys + 1, ktype->keys + 2, ktype->keys + 3, ktype->keys + 4, ktype->keys + 5, ktype->keys + 6, ktype->keys + 7);
+               parse_kbd_keys_from_prop(prop, ktype);
        else if (property_get("hal.sensors.kbd.type", prop, 0))
                ktype = &KeysType[atoi(prop)];
        else