chiark / gitweb /
[PATCH] rename udev_lib to udev_utils and dev_d to udev_multiplex
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>
Thu, 25 Nov 2004 01:44:38 +0000 (02:44 +0100)
committerGreg KH <gregkh@suse.de>
Wed, 27 Apr 2005 05:44:02 +0000 (22:44 -0700)
19 files changed:
Makefile
klibc_fixups/klibc_fixups.c
namedev.c
namedev_parse.c
udev.c
udev.h
udev_add.c
udev_config.c
udev_db.c
udev_multiplex.c [moved from dev_d.c with 93% similarity]
udev_remove.c
udev_start.c
udev_sysfs.c
udev_utils.c [moved from udev_lib.c with 99% similarity]
udev_utils.h [moved from udev_lib.h with 100% similarity]
udevd.c
udevinfo.c
udevsend.c
udevtest.c

index c89fa0f..4d48b3c 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
index 2d673d8..175cf27 100644 (file)
@@ -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"
index dca405c..126453c 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"
index cb1760f..d39141b 100644 (file)
@@ -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 e71cddd..9b0a00f 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 e834f1e..1e3db5a 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];
index 4fb5ef1..f537f56 100644 (file)
@@ -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"
index 1984739..51bdc72 100644 (file)
@@ -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"
index e07e72b..36da264 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"
 
similarity index 93%
rename from dev_d.c
rename to udev_multiplex.c
index 817355a..7e3dc65 100644 (file)
--- a/dev_d.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];
index 8887125..1425035 100644 (file)
@@ -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"
index 3e3062c..129af42 100644 (file)
@@ -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);
index 4976b8f..6655968 100644 (file)
@@ -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 */
similarity index 99%
rename from udev_lib.c
rename to udev_utils.c
index 86a526f..bdf0233 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "udev.h"
 #include "logging.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "list.h"
 
 
similarity index 100%
rename from udev_lib.h
rename to udev_utils.h
diff --git a/udevd.c b/udevd.c
index bd36d2c..06b172b 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"
 
index 9ba302c..6e6b9ae 100644 (file)
@@ -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"
index 7d86557..341ed4c 100644 (file)
@@ -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"
index b9a5fea..37ec767 100644 (file)
@@ -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"