apply format char to variables exported by ENV

[elogind.git] / udev_rules.c

diff --git a/udev_rules.c b/udev_rules.c
index 1aedb111181f79cda426eab7d4914ccf553c3aba..5b1e6889ece2cdf53525c1d603f75789f88d5aa9 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -293,7 +293,7 @@ static int find_free_number(const char *base, const char *devpath)
        static int warn = 1;
 
        if (warn) {
-               err("%%e is deprecated, will be removed and is unlikey to work correctly. Don't use it.");
+               err("%%e is deprecated, will be removed and is unlikely to work correctly. Don't use it.");
                warn = 0;
        }
 
@@ -610,7 +610,7 @@ found:
                                snprintf(udev->tmp_node, sizeof(udev->tmp_node), "%s/.tmp-%u-%u",
                                         udev_root, major(udev->devt), minor(udev->devt));
                                udev->tmp_node[sizeof(udev->tmp_node)-1] = '\0';
-                               udev_make_node(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
+                               udev_node_mknod(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
                        }
                        strlcat(string, udev->tmp_node, maxsize);
                        dbg("substitute temporary device node name '%s'", udev->tmp_node);
@@ -903,10 +903,13 @@ try_parent:
                if (pair->key.operation == KEY_OP_ASSIGN) {
                        const char *key_name = key_pair_name(rule, pair);
                        const char *value = key_val(rule, &pair->key);
+                       char *key_value = name_list_key_add(&udev->env_list, key_name, value);
+                       if (key_value == NULL)
+                               break;
 
-                       name_list_key_add(&udev->env_list, key_name, value);
-                       setenv(key_name, value, 1);
-                       dbg("export ENV '%s=%s'", key_name, value);
+                       udev_rules_apply_format(udev, key_value, NAME_SIZE);
+                       putenv(key_value);
+                       dbg("export ENV '%s'", key_value);
                }
        }