X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-util.c;h=1cd18c890696968e8684dc0610486174b5277210;hb=2c7b88c4a55426087955a12aad33c1935e639876;hp=55bac9a476c18d6273c90daf014a2ac9be6a69bc;hpb=cabfd8d0b487b856a2a41b9595e310e63674b99f;p=elogind.git

diff --git a/udev/lib/libudev-util.c b/udev/lib/libudev-util.c
index 55bac9a47..1cd18c890 100644
--- a/udev/lib/libudev-util.c
+++ b/udev/lib/libudev-util.c
@@ -31,7 +31,7 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
-static ssize_t get_sys_link(struct udev *udev, const char *slink, const char *syspath, char *subsystem, size_t size)
+static ssize_t get_sys_link(struct udev *udev, const char *slink, const char *syspath, char *value, size_t size)
 {
 	char path[UTIL_PATH_SIZE];
 	ssize_t len;
@@ -48,8 +48,8 @@ static ssize_t get_sys_link(struct udev *udev, const char *slink, const char *sy
 	if (pos == NULL)
 		return -1;
 	pos = &pos[1];
-	info(udev, "resolved link to: '%s'\n", pos);
-	return util_strlcpy(subsystem, pos, size);
+	dbg(udev, "resolved link to: '%s'\n", pos);
+	return util_strlcpy(value, pos, size);
 }
 
 ssize_t util_get_sys_subsystem(struct udev *udev, const char *syspath, char *subsystem, size_t size)
@@ -114,7 +114,6 @@ size_t util_path_encode(char *s, size_t len)
 	char t[(len * 3)+1];
 	size_t i, j;
 
-	t[0] = '\0';
 	for (i = 0, j = 0; s[i] != '\0'; i++) {
 		if (s[i] == '/') {
 			memcpy(&t[j], "\\x2f", 4);
@@ -127,8 +126,11 @@ size_t util_path_encode(char *s, size_t len)
 			j++;
 		}
 	}
-	t[j] = '\0';
-	strncpy(s, t, len);
+	if (len == 0)
+		return j;
+	i = (j < len - 1) ? j : len - 1;
+	memcpy(s, t, i);
+	s[i] = '\0';
 	return j;
 }
 
@@ -329,8 +331,47 @@ static int utf8_encoded_valid_unichar(const char *str)
 	return len;
 }
 
+int udev_util_replace_whitespace(const char *str, char *to, size_t len)
+{
+	size_t i, j;
+
+	/* strip trailing whitespace */
+	len = strnlen(str, len);
+	while (len && isspace(str[len-1]))
+		len--;
+
+	/* strip leading whitespace */
+	i = 0;
+	while (isspace(str[i]) && (i < len))
+		i++;
+
+	j = 0;
+	while (i < len) {
+		/* substitute multiple whitespace with a single '_' */
+		if (isspace(str[i])) {
+			while (isspace(str[i]))
+				i++;
+			to[j++] = '_';
+		}
+		to[j++] = str[i++];
+	}
+	to[j] = '\0';
+	return 0;
+}
+
+static int is_whitelisted(char c, const char *white)
+{
+	if ((c >= '0' && c <= '9') ||
+	    (c >= 'A' && c <= 'Z') ||
+	    (c >= 'a' && c <= 'z') ||
+	    strchr("#+-.:=@_", c) != NULL ||
+	    (white != NULL && strchr(white, c) != NULL))
+		return 1;
+	return 0;
+}
+
 /* allow chars in whitelist, plain ascii, hex-escaping and valid utf8 */
-int util_replace_chars(char *str, const char *white)
+int udev_util_replace_chars(char *str, const char *white)
 {
 	size_t i = 0;
 	int replaced = 0;
@@ -338,16 +379,7 @@ int util_replace_chars(char *str, const char *white)
 	while (str[i] != '\0') {
 		int len;
 
-		/* accept whitelist */
-		if (white != NULL && strchr(white, str[i]) != NULL) {
-			i++;
-			continue;
-		}
-
-		/* accept plain ascii char */
-		if ((str[i] >= '0' && str[i] <= '9') ||
-		    (str[i] >= 'A' && str[i] <= 'Z') ||
-		    (str[i] >= 'a' && str[i] <= 'z')) {
+		if (is_whitelisted(str[i], white)) {
 			i++;
 			continue;
 		}
@@ -366,7 +398,7 @@ int util_replace_chars(char *str, const char *white)
 		}
 
 		/* if space is allowed, replace whitespace with ordinary space */
-		if (isspace(str[i]) && strchr(white, ' ') != NULL) {
+		if (isspace(str[i]) && white != NULL && strchr(white, ' ') != NULL) {
 			str[i] = ' ';
 			i++;
 			replaced++;
@@ -378,6 +410,49 @@ int util_replace_chars(char *str, const char *white)
 		i++;
 		replaced++;
 	}
-
 	return replaced;
 }
+
+/**
+ * util_encode_string:
+ * @str: input string to be encoded
+ * @str_enc: output string to store the encoded input string
+ * @len: maximum size of the output string, which may be
+ *       four times as long as the input string
+ *
+ * Encode all potentially unsafe characters of a string to the
+ * corresponding hex value prefixed by '\x'.
+ *
+ * Returns: 0 if the entire string was copied, non-zero otherwise.
+ **/
+int udev_util_encode_string(const char *str, char *str_enc, size_t len)
+{
+	size_t i, j;
+
+	if (str == NULL || str_enc == NULL || len == 0)
+		return -1;
+
+	str_enc[0] = '\0';
+	for (i = 0, j = 0; str[i] != '\0'; i++) {
+		int seqlen;
+
+		seqlen = utf8_encoded_valid_unichar(&str[i]);
+		if (seqlen > 1) {
+			memcpy(&str_enc[j], &str[i], seqlen);
+			j += seqlen;
+			i += (seqlen-1);
+		} else if (str[i] == '\\' || !is_whitelisted(str[i], NULL)) {
+			sprintf(&str_enc[j], "\\x%02x", (unsigned char) str[i]);
+			j += 4;
+		} else {
+			str_enc[j] = str[i];
+			j++;
+		}
+		if (j+3 >= len)
+			goto err;
+	}
+	str_enc[j] = '\0';
+	return 0;
+err:
+	return -1;
+}