summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile10
-rw-r--r--klibc_fixups/klibc_fixups.c2
-rw-r--r--namedev.c2
-rw-r--r--namedev_parse.c2
-rw-r--r--udev.c8
-rw-r--r--udev.h2
-rw-r--r--udev_add.c2
-rw-r--r--udev_config.c2
-rw-r--r--udev_db.c2
-rw-r--r--udev_multiplex.c (renamed from dev_d.c)6
-rw-r--r--udev_remove.c2
-rw-r--r--udev_start.c4
-rw-r--r--udev_sysfs.c2
-rw-r--r--udev_utils.c (renamed from udev_lib.c)2
-rw-r--r--udev_utils.h (renamed from udev_lib.h)0
-rw-r--r--udevd.c2
-rw-r--r--udevinfo.c2
-rw-r--r--udevsend.c1
-rw-r--r--udevtest.c2
19 files changed, 27 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index c89fa0feee..4d48b3c9e0 100644
--- 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 2d673d8ca9..175cf27fe4 100644
--- 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 dca405ceba..126453cc89 100644
--- 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 cb1760fd57..d39141bfc7 100644
--- 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 e71cddd3ee..9b0a00fb78 100644
--- 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 e834f1e5b9..1e3db5af27 100644
--- 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 4fb5ef18c0..f537f567cc 100644
--- 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 198473936f..51bdc720a7 100644
--- 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 e07e72b858..36da264716 100644
--- 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
index 817355af60..7e3dc656d6 100644
--- 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 8887125dd8..142503589a 100644
--- 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 3e3062c019..129af4291a 100644
--- 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 4976b8f308..6655968433 100644
--- 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
index 86a526f7e8..bdf0233e3a 100644
--- 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
index b9b0fda678..b9b0fda678 100644
--- a/udev_lib.h
+++ b/udev_utils.h
diff --git a/udevd.c b/udevd.c
index bd36d2c192..06b172bc25 100644
--- 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 9ba302cbdc..6e6b9aeb3e 100644
--- 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 7d865573c2..341ed4cc36 100644
--- 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 b9a5fea489..37ec767e13 100644
--- 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"
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-11 08:39:26 +0000