remove all PHYSDEVPATH handling and warning about

[elogind.git] / udev / lib / libudev-device.c

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 1a9d0a1e69aa9fd4a8454a9b31076366e31f47d5..ddc4b34115ac0848ba5db5a995ac94bcc8f16bcd 100644 (file)
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 Kay Sievers <kay.sievers@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
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <stdio.h>
@@ -44,7 +36,7 @@ struct udev_device {
        char *driver;
        char *action;
        char *devpath_old;
-       char *physdevpath;
+       char *knodename;
        char **envp;
        char *monitor_buf;
        size_t monitor_buf_len;
@@ -216,6 +208,8 @@ int udev_device_read_uevent_file(struct udev_device *udev_device)
                        maj = strtoull(&line[6], NULL, 10);
                else if (strncmp(line, "MINOR=", 6) == 0)
                        min = strtoull(&line[6], NULL, 10);
+               else if (strncmp(line, "DEVNAME=", 8) == 0)
+                       udev_device_set_knodename(udev_device, &line[8]);
 
                udev_device_add_property_from_string(udev_device, line);
        }
@@ -303,7 +297,7 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
        /* path is not a root directory */
        subdir = &syspath[len+1];
        pos = strrchr(subdir, '/');
-       if (pos == NULL || pos < &subdir[2]) {
+       if (pos == NULL || pos[1] == '\0' || pos < &subdir[2]) {
                dbg(udev, "not a subdir :%s\n", syspath);
                return NULL;
        }
@@ -629,7 +623,7 @@ void udev_device_unref(struct udev_device *udev_device)
        free(udev_device->action);
        free(udev_device->driver);
        free(udev_device->devpath_old);
-       free(udev_device->physdevpath);
+       free(udev_device->knodename);
        udev_list_cleanup_entries(udev_device->udev, &udev_device->sysattr_list);
        free(udev_device->envp);
        free(udev_device->monitor_buf);
@@ -1082,7 +1076,6 @@ const char *udev_device_get_property_value(struct udev_device *udev_device, cons
 #define MONITOR_BUF_SIZE               4096
 static int update_envp_monitor_buf(struct udev_device *udev_device)
 {
-       const char *action;
        struct udev_list_entry *list_entry;
        size_t bufpos;
        size_t len;
@@ -1101,23 +1094,8 @@ static int update_envp_monitor_buf(struct udev_device *udev_device)
        if (udev_device->envp == NULL)
                return -ENOMEM;
 
-       /* header <action>@<devpath> */
-       action = udev_device_get_action(udev_device);
-       if (action == NULL)
-               return -EINVAL;
-       bufpos = util_strlcpy(udev_device->monitor_buf, action, MONITOR_BUF_SIZE);
-       len = util_strlcpy(&udev_device->monitor_buf[bufpos], "@", MONITOR_BUF_SIZE-bufpos);
-       if (len >= MONITOR_BUF_SIZE-bufpos)
-               return -EINVAL;
-       bufpos += len;
-       len = util_strlcpy(&udev_device->monitor_buf[bufpos],
-                          udev_device_get_devpath(udev_device),
-                          MONITOR_BUF_SIZE-bufpos);
-       if (len+1 >= MONITOR_BUF_SIZE-bufpos)
-               return -EINVAL;
-       bufpos += len+1;
-
        i = 0;
+       bufpos = 0;
        udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
                /* add string to envp array */
                udev_device->envp[i++] = &udev_device->monitor_buf[bufpos];
@@ -1199,15 +1177,15 @@ int udev_device_set_devpath_old(struct udev_device *udev_device, const char *dev
        return 0;
 }
 
-const char *udev_device_get_physdevpath(struct udev_device *udev_device)
+const char *udev_device_get_knodename(struct udev_device *udev_device)
 {
-       return udev_device->physdevpath;
+       return udev_device->knodename;
 }
 
-int udev_device_set_physdevpath(struct udev_device *udev_device, const char *physdevpath)
+int udev_device_set_knodename(struct udev_device *udev_device, const char *knodename)
 {
-       udev_device->physdevpath = strdup(physdevpath);
-       if (udev_device->physdevpath == NULL)
+       udev_device->knodename = strdup(knodename);
+       if (udev_device->knodename == NULL)
                return -ENOMEM;
        return 0;
 }