shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

[PATCH] rename udev_lib to udev_utils and dev_d to udev_multiplex

Browse Source
This commit is contained in:
kay.sievers@vrfy.org 2004-11-25 02:44:38 +01:00 committed by Greg KH
parent 8a0dc204e9
commit 9af5bb2f8f
19 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -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

2
klibc_fixups/klibc_fixups.c
View 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"

2
namedev.c
View File

@ -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"

2
namedev_parse.c
View 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"

8
udev.c
View File

@ -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();

2
udev.h
View File

@ -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];

2
udev_add.c
View 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"

2
udev_config.c
View 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"

2
udev_db.c
View File

@ -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"

6
dev_d.c → udev_multiplex.c
View File

@ -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];

2
udev_remove.c
View 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"

4
udev_start.c
View 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);

2
udev_sysfs.c
View 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 */

2
udev_lib.c → udev_utils.c
View File

@ -32,7 +32,7 @@
#include "udev.h"
#include "logging.h"
#include "udev_lib.h"
#include "udev_utils.h"
#include "list.h"

0
udev_lib.h → udev_utils.h
View File

2
udevd.c
View File

@ -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"

2
udevinfo.c
View 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"

1
udevsend.c
View 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"

2
udevtest.c
View 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"