shrink struct udev_event

[elogind.git] / udev / udev-rules.c

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index b456c3da33c5c5c914f9d6e22cb2d94c8b70d19e..19ee06d3798c996a50ce2ae6b3ce6b0e9ff329c0 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1783,11 +1783,12 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                char **envp;
                                char result[UTIL_PATH_SIZE];
 
+                               free(event->program_result);
+                               event->program_result = NULL;
                                util_strlcpy(program, &rules->buf[cur->key.value_off], sizeof(program));
                                udev_event_apply_format(event, program, sizeof(program));
                                envp = udev_device_get_properties_envp(event->dev);
                                if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL) != 0) {
-                                       event->program_result[0] = '\0';
                                        if (cur->key.op != KEY_OP_NOMATCH)
                                                goto nomatch;
                                } else {
@@ -1799,7 +1800,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                                if (count > 0)
                                                        info(event->udev, "%i character(s) replaced\n" , count);
                                        }
-                                       util_strlcpy(event->program_result, result, sizeof(event->program_result));
+                                       event->program_result = strdup(result);
+                                       dbg(event->udev, "storing result '%s'\n", event->program_result);
                                        if (cur->key.op == KEY_OP_NOMATCH)
                                                goto nomatch;
                                }
@@ -1884,7 +1886,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                        break;
                                if (cur->key.op == KEY_OP_ASSIGN_FINAL)
                                        event->group_final = 1;
-                               util_strlcpy(group,  &rules->buf[cur->key.value_off], sizeof(group));
+                               util_strlcpy(group, &rules->buf[cur->key.value_off], sizeof(group));
                                udev_event_apply_format(event, group, sizeof(group));
                                event->gid = util_lookup_group(event->udev, group);
                                break;
@@ -1898,7 +1900,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                        break;
                                if (cur->key.op == KEY_OP_ASSIGN_FINAL)
                                        event->mode_final = 1;
-                               util_strlcpy(mode,  &rules->buf[cur->key.value_off], sizeof(mode));
+                               util_strlcpy(mode, &rules->buf[cur->key.value_off], sizeof(mode));
                                udev_event_apply_format(event, mode, sizeof(mode));
                                event->mode = strtol(mode, &endptr, 8);
                                if (endptr[0] != '\0') {
@@ -1950,6 +1952,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                case TK_A_NAME:
                        {
                                const char *name  = &rules->buf[cur->key.value_off];
+                               char name_str[UTIL_PATH_SIZE];
                                int count;
 
                                if (event->name_final)
@@ -1957,17 +1960,17 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                if (cur->key.op == KEY_OP_ASSIGN_FINAL)
                                        event->name_final = 1;
                                if (name[0] == '\0') {
-                                       event->name[0] = '\0';
-                                       event->name_ignore = 1;
+                                       free(event->name);
+                                       event->name = NULL;
                                        break;
                                }
-                               event->name_ignore = 0;
-                               util_strlcpy(event->name, name, sizeof(event->name));
-                               udev_event_apply_format(event, event->name, sizeof(event->name));
+                               util_strlcpy(name_str, name, sizeof(name_str));
+                               udev_event_apply_format(event, name_str, sizeof(name_str));
                                if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
-                                       count = util_replace_chars(event->name, ALLOWED_CHARS_FILE);
+                                       count = util_replace_chars(name_str, ALLOWED_CHARS_FILE);
                                        if (count > 0)
                                                info(event->udev, "%i character(s) replaced\n", count);
+                                       event->name = strdup(name_str);
                                }
                                break;
                        }