[PATCH] DEVNODE -> DEVNAME transition fixes

  It seems that the transition from DEVNODE to DEVNAME wasn't done
  everywhere. This broke udev_dbus for me.

  Attached patch does the transition in the places it wasn't done yet.

diff --git a/dev_d.c b/dev_d.c
index 483ceb4b1b983f398831a46d8db41aa48f88bd18..81c70133159203970bba27ff074e0486004a580b 100644 (file)
--- a/dev_d.c
+++ b/dev_d.c
@@ -11,8 +11,8 @@
 /*
  * This essentially emulates the following shell script logic in C:
  *     DIR="/etc/dev.d"
- *     export DEVNODE="whatever_dev_name_udev_just_gave"
- *     for I in "${DIR}/$DEVNODE/"*.dev "${DIR}/$1/"*.dev "${DIR}/default/"*.dev ; do
+ *     export DEVNAME="whatever_dev_name_udev_just_gave"
+ *     for I in "${DIR}/$DEVNAME/"*.dev "${DIR}/$1/"*.dev "${DIR}/default/"*.dev ; do
  *             if [ -f $I ]; then $I $1 ; fi
  *     done
  *     exit 1;

diff --git a/extras/dbus/udev_dbus.c b/extras/dbus/udev_dbus.c
index 955a3dbb49fe56d7336582532340aa3fc07d6795..e99e92ec8715faedcd3bf4d528cd932aaf5c9c74 100644 (file)
--- a/extras/dbus/udev_dbus.c
+++ b/extras/dbus/udev_dbus.c
@@ -80,10 +80,10 @@ static void sysbus_connect(void)
 
 /** Send out a signal that a device node is created
  *
- *  @param  devnode             name of the device node, e.g. /dev/sda1
+ *  @param  devname             name of the device node, e.g. /dev/sda1
  *  @param  path                Sysfs path of device
  */
-static void sysbus_send_create(const char *devnode, const char *path)
+static void sysbus_send_create(const char *devname, const char *path)
 {
        DBusMessage* message;
        DBusMessageIter iter;
@@ -94,7 +94,7 @@ static void sysbus_send_create(const char *devnode, const char *path)
                                          "NodeCreated");
 
        dbus_message_iter_init(message, &iter);
-       dbus_message_iter_append_string(&iter, devnode);
+       dbus_message_iter_append_string(&iter, devname);
        dbus_message_iter_append_string(&iter, path);
 
        if ( !dbus_connection_send(sysbus_connection, message, NULL) )
@@ -107,10 +107,10 @@ static void sysbus_send_create(const char *devnode, const char *path)
 
 /** Send out a signal that a device node is deleted
  *
- *  @param  devnode             Name of the device node, e.g. /udev/sda1
+ *  @param  devname             Name of the device node, e.g. /udev/sda1
  *  @param  path                Sysfs path of device
  */
-static void sysbus_send_remove(const char *devnode, const char *path)
+static void sysbus_send_remove(const char *devname, const char *path)
 {
        DBusMessage* message;
        DBusMessageIter iter;
@@ -121,7 +121,7 @@ static void sysbus_send_remove(const char *devnode, const char *path)
                                          "NodeDeleted");
 
        dbus_message_iter_init(message, &iter);
-       dbus_message_iter_append_string(&iter, devnode);
+       dbus_message_iter_append_string(&iter, devname);
        dbus_message_iter_append_string(&iter, path);
 
        if ( !dbus_connection_send(sysbus_connection, message, NULL) )
@@ -136,7 +136,7 @@ int main(int argc, char *argv[], char *envp[])
 {
        char *action;
        char *devpath;
-       char *devnode;
+       char *devname;
        int retval = 0;
 
        init_logging("udev_dbus");
@@ -155,17 +155,17 @@ int main(int argc, char *argv[], char *envp[])
                dbg("no devpath?");
                goto exit;
        }
-       devnode = get_devnode();
-       if (!devnode) {
-               dbg("no devnode?");
+       devname = get_devname();
+       if (!devname) {
+               dbg("no devname?");
                goto exit;
        }
 
        if (strcmp(action, "add") == 0) {
-               sysbus_send_create(devnode, devpath);
+               sysbus_send_create(devname, devpath);
        } else {
                if (strcmp(action, "remove") == 0) {
-                       sysbus_send_remove(devnode, devpath);
+                       sysbus_send_remove(devname, devpath);
                } else {
                        dbg("unknown action '%s'", action);
                        retval = -EINVAL;

diff --git a/extras/selinux/udev_selinux.c b/extras/selinux/udev_selinux.c
index bbbdd6ba5373dde5b696ff9a16127c6a968a0c2a..df23d9e6a70dc612f2cd489fd36e1ceee752b0ee 100644 (file)
--- a/extras/selinux/udev_selinux.c
+++ b/extras/selinux/udev_selinux.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[], char *envp[])
 {
        char *action;
        char *devpath;
-       char *devnode;
+       char *devname;
        int retval = 0;
 
        init_logging("udev_selinux");
@@ -58,14 +58,14 @@ int main(int argc, char *argv[], char *envp[])
                dbg("no action?");
                goto exit;
        }
-       devnode = get_devnode();
-       if (!devnode) {
-               dbg("no devnode?");
+       devname = get_devname();
+       if (!devname) {
+               dbg("no devname?");
                goto exit;
        }
 
        if (strcmp(action, "add") == 0)
-               selinux_add_node(devnode);
+               selinux_add_node(devname);
 
 exit:
        return retval;

diff --git a/udev_lib.c b/udev_lib.c
index db1096ebf7b7254847c98f521d44e462cd373961..381492db01feb4bf51f0cf84f7c5250b20759fac 100644 (file)
--- a/udev_lib.c
+++ b/udev_lib.c
@@ -58,15 +58,15 @@ char *get_devpath(void)
        return devpath;
 }
 
-char *get_devnode(void)
+char *get_devname(void)
 {
-       char *devnode;
+       char *devname;
 
-       devnode = getenv("DEVNODE");
-       if (devnode != NULL && strlen(devnode) > NAME_SIZE)
-               devnode[NAME_SIZE-1] = '\0';
+       devname = getenv("DEVNAME");
+       if (devname != NULL && strlen(devname) > NAME_SIZE)
+               devname[NAME_SIZE-1] = '\0';
 
-       return devnode;
+       return devname;
 }
 
 char *get_seqnum(void)

diff --git a/udev_lib.h b/udev_lib.h
index e412ba96f49497d898aa24ef63ace518f1034182..cc264fa9b4ce27f9ebd496483d053aee4e1b1ae4 100644 (file)
--- a/udev_lib.h
+++ b/udev_lib.h
@@ -68,7 +68,7 @@ do { \
 
 extern char *get_action(void);
 extern char *get_devpath(void);
-extern char *get_devnode(void);
+extern char *get_devname(void);
 extern char *get_seqnum(void);
 extern char *get_subsystem(char *subsystem);
 extern char get_device_type(const char *path, const char *subsystem);