[PATCH] rename udev_lib to udev_utils and dev_d to udev_multiplex

diff --git a/Makefile b/Makefile
index c89fa0feeef6dd972de8031fc2269cb314b5c75f..4d48b3c9e0779b58227a48f4e28b5bb139421534 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -204,20 +204,20 @@ SYSFS =   $(PWD)/libsysfs/sysfs_bus.o     \
        $(PWD)/libsysfs/sysfs_utils.o   \
        $(PWD)/libsysfs/dlist.o
 
-OBJS = udev_lib.o      \
+OBJS = udev_utils.o    \
        udev_config.o   \
        udev_add.o      \
        udev_remove.o   \
        udev_start.o    \
        udev_sysfs.o    \
        udev_db.o       \
+       udev_multiplex.o\
        namedev.o       \
        namedev_parse.o \
-       dev_d.o         \
        $(SYSFS)
 
 HEADERS =      udev.h          \
-               udev_lib.h      \
+               udev_utils.h    \
                namedev.h       \
                udev_version.h  \
                udev_db.h       \
@@ -291,11 +291,11 @@ $(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS)
        $(QUIET) $(STRIPCMD) $@
 
 $(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS)
-       $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udev_db.o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_utils.o udev_config.o udev_db.o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(QUIET) $(STRIPCMD) $@
 
 $(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h
-       $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_lib.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_utils.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(QUIET) $(STRIPCMD) $@
 
 $(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h

diff --git a/klibc_fixups/klibc_fixups.c b/klibc_fixups/klibc_fixups.c
index 2d673d8ca9bffcf89ce04d694d9d47d492938fb0..175cf27fe46c5477eddb2bdfb4575531674acc4d 100644 (file)
--- a/klibc_fixups/klibc_fixups.c
+++ b/klibc_fixups/klibc_fixups.c
@@ -30,7 +30,7 @@
 
 #include "pwd.h"
 #include "../udev.h"
-#include "../udev_lib.h"
+#include "../udev_utils.h"
 #include "../logging.h"
 
 #define PW_FILE                "/etc/passwd"

diff --git a/namedev.c b/namedev.c
index dca405ceba1d041be35f08e612f26e1ce4acf937..126453cc892654751eb850e636870dc80be68ebb 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -36,7 +36,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"

diff --git a/namedev_parse.c b/namedev_parse.c
index cb1760fd578c31f889685e954a5f0a9f814d8580..d39141bfc7536d1718f271502a887014eabbd12d 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "logging.h"
 #include "namedev.h"
 

diff --git a/udev.c b/udev.c
index e71cddd3eee3cfd5f47d8ba892c832713f38aaa9..9b0a00fb78c7c53d642fc17ed88ea345c782c0c8 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -33,7 +33,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
 #include "namedev.h"
@@ -182,7 +182,7 @@ int main(int argc, char *argv[], char *envp[])
                        /* run dev.d/ scripts if we created a node or changed a netif name */
                        if (udev.devname[0] != '\0') {
                                setenv("DEVNAME", udev.devname, 1);
-                               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+                               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                        }
 
                        sysfs_close_class_device(class_dev);
@@ -200,7 +200,7 @@ int main(int argc, char *argv[], char *envp[])
                        /* run dev.d/ scripts if we're not instructed to ignore the event */
                        if (udev.devname[0] != '\0') {
                                setenv("DEVNAME", udev.devname, 1);
-                               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+                               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                        }
 
                }
@@ -229,7 +229,7 @@ int main(int argc, char *argv[], char *envp[])
 
 hotplug:
        if (manage_hotplug_event())
-               dev_d_execute(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
+               udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
 exit:
        logging_close();

diff --git a/udev.h b/udev.h
index e834f1e5b9008fa478fbbc7b062ddb0aed6488a1..1e3db5af27e95c4309e4ec24096ee43e8ba2f73c 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -78,7 +78,7 @@ extern int udev_remove_device(struct udevice *udev);
 extern void udev_init_config(void);
 extern int udev_start(void);
 extern int parse_get_pair(char **orig_string, char **left, char **right);
-extern void dev_d_execute(struct udevice *udev, const char *basedir, const char *suffix);
+extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
 
 extern char sysfs_path[SYSFS_PATH_MAX];
 extern char udev_root[PATH_MAX];

diff --git a/udev_add.c b/udev_add.c
index 4fb5ef18c06149200406753edfc0eb08acbd7a40..f537f567ccdfb36c034af288cc26841f9191d9d7 100644 (file)
--- a/udev_add.c
+++ b/udev_add.c
@@ -38,7 +38,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"

diff --git a/udev_config.c b/udev_config.c
index 198473936f08118c1d6c91d23efeb20be2b1b9dd..51bdc720a73333126b6173001714fef0263711b7 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -34,7 +34,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"

diff --git a/udev_db.c b/udev_db.c
index e07e72b85843e079dec58d0948083d47c5294672..36da2647165dc0b925c09993aa3ebc1a7916a860 100644 (file)
--- a/udev_db.c
+++ b/udev_db.c
@@ -33,7 +33,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "logging.h"
 #include "udev_db.h"
 

diff --git a/dev_d.c b/udev_multiplex.c
similarity index 93%
rename from dev_d.c
rename to udev_multiplex.c
index 817355af60397c4c4f221a793c860d0b0f859ecd..7e3dc656d6d7d48edcb3ff284bb805c8409a0d26 100644 (file)
--- a/dev_d.c
+++ b/udev_multiplex.c
@@ -1,5 +1,5 @@
 /*
- * dev_d.c - dev.d/ multiplexer
+ * udev_multiplex.c directory multiplexer
  * 
  * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
  *
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "logging.h"
 
 static int run_program(const char *filename, void *data)
@@ -71,7 +71,7 @@ static int run_program(const char *filename, void *data)
  *     subsystem/
  *     default/
  */
-void dev_d_execute(struct udevice *udev, const char *basedir, const char *suffix)
+void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix)
 {
        char dirname[PATH_MAX];
        char devname[NAME_SIZE];

diff --git a/udev_remove.c b/udev_remove.c
index 8887125dd8aeba84b17ef77604a0456a2e86d101..142503589a6f90a42f0da4cb392cba12f9f75525 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "namedev.h"
 #include "udev_db.h"

diff --git a/udev_start.c b/udev_start.c
index 3e3062c0191c1cd97f535d6c66e75859a76e2870..129af4291aa7d2fcb04b5251d740ae0354ded1d1 100644 (file)
--- a/udev_start.c
+++ b/udev_start.c
@@ -35,7 +35,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "logging.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "list.h"
 #include "udev.h"
 
@@ -111,7 +111,7 @@ static int add_device(char *devpath, char *subsystem)
        /* run dev.d/ scripts if we created a node or changed a netif name */
        if (udev.devname[0] != '\0') {
                setenv("DEVNAME", udev.devname, 1);
-               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
        }
 
        sysfs_close_class_device(class_dev);

diff --git a/udev_sysfs.c b/udev_sysfs.c
index 4976b8f308cfa72c6d43682908cd089024fe1f0e..6655968433cfb47a63d6373b3650b5c8e7a95279 100644 (file)
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -31,7 +31,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev_version.h"
 #include "udev_sysfs.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "logging.h"
 
 /* list of subsystem specific files, NULL if there is no file to wait for */

diff --git a/udev_lib.c b/udev_utils.c
similarity index 99%
rename from udev_lib.c
rename to udev_utils.c
index 86a526f7e816ecca46aedf4dc622a355d92b7b74..bdf0233e3ae1c5828f6cedc4acfea3463a227a58 100644 (file)
--- a/udev_lib.c
+++ b/udev_utils.c
@@ -32,7 +32,7 @@
 
 #include "udev.h"
 #include "logging.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "list.h"
 
 

diff --git a/udev_lib.h b/udev_utils.h
similarity index 100%
rename from udev_lib.h
rename to udev_utils.h

diff --git a/udevd.c b/udevd.c
index bd36d2c192d1e606a84b03e75c1689931cb8e7b4..06b172bc253b98db2b97c9b02f141d734d7ac4ea 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -38,8 +38,8 @@
 
 #include "list.h"
 #include "udev.h"
-#include "udev_lib.h"
 #include "udev_version.h"
+#include "udev_utils.h"
 #include "udevd.h"
 #include "logging.h"
 

diff --git a/udevinfo.c b/udevinfo.c
index 9ba302cbdc2c5e6afda8e0102822efe423a54a2c..6e6b9aeb3ed572e1b398ca0605f9845c8c4736fd 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -30,7 +30,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "libsysfs/dlist.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "udev_db.h"
 #include "logging.h"

diff --git a/udevsend.c b/udevsend.c
index 7d865573c27b62f95073cca655df969cb1058941..341ed4cc36e033814812855b06bb76141dd0cf1d 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -36,7 +36,6 @@
 #include <linux/stddef.h>
 
 #include "udev.h"
-#include "udev_lib.h"
 #include "udev_version.h"
 #include "udevd.h"
 #include "logging.h"

diff --git a/udevtest.c b/udevtest.c
index b9a5fea489491aaf78f8c886ce28753373aa1d0c..37ec767e138ad189073255fa209065082e213c75 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -29,7 +29,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "namedev.h"
 #include "logging.h"