summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorYu, Li-Yu <afg984@gmail.com>2020-10-21 00:38:21 +0800
committerYu, Li-Yu <afg984@gmail.com>2020-10-29 20:15:23 +0800
commitaea3253e7121ecc91754d1d39cd7842a621f55bc (patch)
tree9eb00d65b4705133702f01cca6172197026100b6 /src/shared
parent43e7dd70bc9f397427931bbc0996fc0cf4e9dc32 (diff)
downloadsystemd-aea3253e7121ecc91754d1d39cd7842a621f55bc.tar.gz
udev: escaped string syntax e"..." in rule files
* Existing valid rule files written with KEY="value" are not affected * Now, KEY=e"value\n" becomes valid. Where `\n` is a newline character * Escape sequences supported by src/basic/escape.h:cunescape() is supported
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/udev-util.c49
-rw-r--r--src/shared/udev-util.h2
2 files changed, 51 insertions, 0 deletions
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 98bbfb2ae3..500eb13c65 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -6,13 +6,16 @@
#include "alloc-util.h"
#include "device-util.h"
#include "env-file.h"
+#include "escape.h"
#include "log.h"
+#include "macro.h"
#include "parse-util.h"
#include "path-util.h"
#include "signal-util.h"
#include "string-table.h"
#include "string-util.h"
#include "udev-util.h"
+#include "utf8.h"
static const char* const resolve_name_timing_table[_RESOLVE_NAME_TIMING_MAX] = {
[RESOLVE_NAME_NEVER] = "never",
@@ -319,3 +322,49 @@ bool device_for_action(sd_device *dev, DeviceAction action) {
return a == action;
}
+
+int udev_rule_parse_value(char *str, char **ret_value, char **ret_endpos) {
+ char *i, *j;
+ int r;
+ bool is_escaped;
+
+ /* value must be double quotated */
+ is_escaped = str[0] == 'e';
+ str += is_escaped;
+ if (str[0] != '"')
+ return -EINVAL;
+ str++;
+
+ if (!is_escaped) {
+ /* unescape double quotation '\"'->'"' */
+ for (i = j = str; *i != '"'; i++, j++) {
+ if (*i == '\0')
+ return -EINVAL;
+ if (i[0] == '\\' && i[1] == '"')
+ i++;
+ *j = *i;
+ }
+ j[0] = '\0';
+ } else {
+ _cleanup_free_ char *unescaped = NULL;
+
+ /* find the end position of value */
+ for (i = str; *i != '"'; i++) {
+ if (i[0] == '\\')
+ i++;
+ if (*i == '\0')
+ return -EINVAL;
+ }
+ i[0] = '\0';
+
+ r = cunescape_length(str, i - str, 0, &unescaped);
+ if (r < 0)
+ return r;
+ assert(r <= i - str);
+ memcpy(str, unescaped, r + 1);
+ }
+
+ *ret_value = str;
+ *ret_endpos = i + 1;
+ return 0;
+}
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index 04c7ce5520..427808c63b 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -32,3 +32,5 @@ int device_wait_for_initialization(sd_device *device, const char *subsystem, use
int device_wait_for_devlink(const char *path, const char *subsystem, usec_t timeout, sd_device **ret);
int device_is_renaming(sd_device *dev);
bool device_for_action(sd_device *dev, DeviceAction action);
+
+int udev_rule_parse_value(char *str, char **ret_value, char **ret_endpos);