Merge nss-myhostname

[elogind.git] / src / udev / udev-event.c

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 2ade0ab81aa7a96e76da04bf85158004b4b86eff..5eedf4f0dfdad2530eb5d25462dd654930ceba71 100644 (file)
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2010 Kay Sievers <kay@vrfy.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
         event->udev = udev;
         udev_list_init(udev, &event->run_list, false);
         event->fd_signal = -1;
-        event->birth_usec = now_usec();
+        event->birth_usec = now(CLOCK_MONOTONIC);
         event->timeout_usec = 30 * 1000 * 1000;
         return event;
 }
@@ -90,24 +90,24 @@ size_t udev_event_apply_format(struct udev_event *event, const char *src, char *
                 const char fmt;
                 enum subst_type type;
         } map[] = {
-                { .name = "devnode",        .fmt = 'N',        .type = SUBST_DEVNODE },
-                { .name = "tempnode",        .fmt = 'N',        .type = SUBST_DEVNODE },
-                { .name = "attr",        .fmt = 's',        .type = SUBST_ATTR },
-                { .name = "sysfs",        .fmt = 's',        .type = SUBST_ATTR },
-                { .name = "env",        .fmt = 'E',        .type = SUBST_ENV },
-                { .name = "kernel",        .fmt = 'k',        .type = SUBST_KERNEL },
-                { .name = "number",        .fmt = 'n',        .type = SUBST_KERNEL_NUMBER },
-                { .name = "driver",        .fmt = 'd',        .type = SUBST_DRIVER },
-                { .name = "devpath",        .fmt = 'p',        .type = SUBST_DEVPATH },
-                { .name = "id",                .fmt = 'b',        .type = SUBST_ID },
-                { .name = "major",        .fmt = 'M',        .type = SUBST_MAJOR },
-                { .name = "minor",        .fmt = 'm',        .type = SUBST_MINOR },
-                { .name = "result",        .fmt = 'c',        .type = SUBST_RESULT },
-                { .name = "parent",        .fmt = 'P',        .type = SUBST_PARENT },
-                { .name = "name",        .fmt = 'D',        .type = SUBST_NAME },
-                { .name = "links",        .fmt = 'L',        .type = SUBST_LINKS },
-                { .name = "root",        .fmt = 'r',        .type = SUBST_ROOT },
-                { .name = "sys",        .fmt = 'S',        .type = SUBST_SYS },
+                { .name = "devnode",  .fmt = 'N', .type = SUBST_DEVNODE },
+                { .name = "tempnode", .fmt = 'N', .type = SUBST_DEVNODE },
+                { .name = "attr",     .fmt = 's', .type = SUBST_ATTR },
+                { .name = "sysfs",    .fmt = 's', .type = SUBST_ATTR },
+                { .name = "env",      .fmt = 'E', .type = SUBST_ENV },
+                { .name = "kernel",   .fmt = 'k', .type = SUBST_KERNEL },
+                { .name = "number",   .fmt = 'n', .type = SUBST_KERNEL_NUMBER },
+                { .name = "driver",   .fmt = 'd', .type = SUBST_DRIVER },
+                { .name = "devpath",  .fmt = 'p', .type = SUBST_DEVPATH },
+                { .name = "id",       .fmt = 'b', .type = SUBST_ID },
+                { .name = "major",    .fmt = 'M', .type = SUBST_MAJOR },
+                { .name = "minor",    .fmt = 'm', .type = SUBST_MINOR },
+                { .name = "result",   .fmt = 'c', .type = SUBST_RESULT },
+                { .name = "parent",   .fmt = 'P', .type = SUBST_PARENT },
+                { .name = "name",     .fmt = 'D', .type = SUBST_NAME },
+                { .name = "links",    .fmt = 'L', .type = SUBST_LINKS },
+                { .name = "root",     .fmt = 'r', .type = SUBST_ROOT },
+                { .name = "sys",      .fmt = 'S', .type = SUBST_SYS },
         };
         const char *from;
         char *s;
@@ -466,9 +466,9 @@ static void spawn_read(struct udev_event *event,
                 int i;
 
                 if (event->timeout_usec > 0) {
-                        unsigned long long age_usec;
+                        usec_t age_usec;
 
-                        age_usec = now_usec() - event->birth_usec;
+                        age_usec = now(CLOCK_MONOTONIC) - event->birth_usec;
                         if (age_usec >= event->timeout_usec) {
                                 log_error("timeout '%s'\n", cmd);
                                 goto out;
@@ -554,9 +554,9 @@ static int spawn_wait(struct udev_event *event, const char *cmd, pid_t pid)
                 int fdcount;
 
                 if (event->timeout_usec > 0) {
-                        unsigned long long age_usec;
+                        usec_t age_usec;
 
-                        age_usec = now_usec() - event->birth_usec;
+                        age_usec = now(CLOCK_MONOTONIC) - event->birth_usec;
                         if (age_usec >= event->timeout_usec)
                                 timeout = 1000;
                         else
@@ -767,7 +767,7 @@ static int rename_netif(struct udev_event *event)
         util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
         err = ioctl(sk, SIOCSIFNAME, &ifr);
         if (err >= 0) {
-                print_kmsg("renamed network interface %s to %s", ifr.ifr_name, ifr.ifr_newname);
+                print_kmsg("renamed network interface %s to %s\n", ifr.ifr_name, ifr.ifr_newname);
         } else {
                 err = -errno;
                 log_error("error changing net interface name %s to %s: %m\n", ifr.ifr_name, ifr.ifr_newname);
@@ -797,8 +797,10 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
                 if (major(udev_device_get_devnum(dev)) != 0)
                         udev_node_remove(dev);
         } else {
-                event->dev_db = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
+                event->dev_db = udev_device_new(event->udev);
                 if (event->dev_db != NULL) {
+                        udev_device_set_syspath(event->dev_db, udev_device_get_syspath(dev));
+                        udev_device_set_subsystem(event->dev_db, udev_device_get_subsystem(dev));
                         udev_device_read_db(event->dev_db, NULL);
                         udev_device_set_info_loaded(event->dev_db);
 
@@ -840,6 +842,12 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
                         if (event->dev_db != NULL)
                                 udev_node_update_old_links(dev, event->dev_db);
 
+                        if (!event->owner_set)
+                                event->uid = udev_device_get_devnode_uid(dev);
+
+                        if (!event->group_set)
+                                event->gid = udev_device_get_devnode_gid(dev);
+
                         if (!event->mode_set) {
                                 if (udev_device_get_devnode_mode(dev) > 0) {
                                         /* kernel supplied value */
@@ -860,7 +868,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
                 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 if (udev_device_get_usec_initialized(event->dev) == 0)
-                        udev_device_set_usec_initialized(event->dev, now_usec());
+                        udev_device_set_usec_initialized(event->dev, now(CLOCK_MONOTONIC));
 
                 /* (re)write database file */
                 udev_device_update_db(dev);