X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=udev%2Fudev-event.c;h=7db75132476124b0bc940ba973565dcaf0ee46f0;hb=dd2247464f56f0cffe92250bb107e97477effbc2;hp=391fce81c3214806539e5692e316b4c19f142190;hpb=79449642ebcb6170adb8d6391518e328a07d9552;p=elogind.git

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 391fce81c..7db751324 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -318,7 +318,7 @@ subst:
 			len = strlen(vbuf);
 			while (len > 0 && isspace(vbuf[--len]))
 				vbuf[len] = '\0';
-			count = udev_util_replace_chars(vbuf, UDEV_ALLOWED_CHARS_INPUT);
+			count = util_replace_chars(vbuf, UDEV_ALLOWED_CHARS_INPUT);
 			if (count > 0)
 				info(event->udev, "%i character(s) replaced\n" , count);
 			l = util_strpcpy(&s, l, vbuf);
@@ -1040,7 +1040,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
 		/* preserve old, or get new initialization timestamp */
 		if (event->dev_db != NULL && udev_device_get_usec_initialized(event->dev_db) > 0)
 			udev_device_set_usec_initialized(event->dev, udev_device_get_usec_initialized(event->dev_db));
-		else
+		else if (udev_device_get_usec_initialized(event->dev) == 0)
 			udev_device_set_usec_initialized(event->dev, now_usec());
 
 		/* (re)write database file */