From 4a539daf1e5daa17b52239478d97f8dc7a6506b6 Mon Sep 17 00:00:00 2001 From: "kay.sievers@vrfy.org" Date: Sat, 27 Mar 2004 01:21:46 -0800 Subject: [PATCH] dev_d.c file sorting and cleanup On Thu, Mar 25, 2004 at 02:52:13AM +0100, Kay Sievers wrote: > Please have look if it still works for you, I only did a very quick > test. Here is a unified version, with all the functions moved to udev_lib.c. We have a generic function now, to call a given fnct(char *) for every file ending with a specific suffix, sorted in lexical order. We use it to execute the dev.d/ files and read our rules.d/ files. The binary should be a bit smaller now. I've also changed it, to not do the dev.d/ exec for net devices. --- dev_d.c | 114 ++++++++++++++++++++-------------------------------------------- 1 file changed, 36 insertions(+), 78 deletions(-) (limited to 'dev_d.c') diff --git a/dev_d.c b/dev_d.c index 9412c3da77..9bb9507b9b 100644 --- a/dev_d.c +++ b/dev_d.c @@ -1,30 +1,23 @@ /* - * dev.d multipleer + * dev_d.c - dev.d/ multiplexer * * Copyright (C) 2004 Greg Kroah-Hartman * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation version 2 of the License. - * - * Based on the klibc version of hotplug written by: - * Author(s) Christian Borntraeger - * which was based on the shell script written by: - * Greg Kroah-Hartman - * */ -/* +/* * 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 - if [ -f $I ]; then $I $1 ; fi - done - exit 1; + * 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 + * if [ -f $I ]; then $I $1 ; fi + * done + * exit 1; */ -#include #include #include #include @@ -35,73 +28,38 @@ #include "udev_lib.h" #include "logging.h" -#define HOTPLUGDIR "/etc/dev.d" -#define SUFFIX ".dev" -#define COMMENT_PREFIX '#' +#define DEVD_DIR "/etc/dev.d/" +#define DEVD_SUFFIX ".dev" -static void run_program(char *name) +static int run_program(char *name) { pid_t pid; dbg("running %s", name); pid = fork(); - - if (pid < 0) { - perror("fork"); - return; - } - - if (pid > 0) { + switch (pid) { + case 0: + /* child */ + execv(name, main_argv); + dbg("exec of child failed"); + exit(1); + case -1: + dbg("fork of child failed"); + break; + return -1; + default: wait(NULL); - return; } - execv(name, main_argv); - exit(1); + return 0; } -static void execute_dir (char *dirname) -{ - DIR *directory; - struct dirent *entry; - char filename[NAME_SIZE]; - int name_len; - - dbg("opening %s", dirname); - directory = opendir(dirname); - if (!directory) - return; - - while ((entry = readdir(directory))) { - if (entry->d_name[0] == '\0') - break; - /* Don't run the files '.', '..', or hidden files, - * or files that start with a '#' */ - if ((entry->d_name[0] == '.') || - (entry->d_name[0] == COMMENT_PREFIX)) - continue; - - /* Nor do we run files that do not end in ".dev" */ - name_len = strlen(entry->d_name); - if (name_len < strlen(SUFFIX)) - continue; - if (strcmp(&entry->d_name[name_len - sizeof (SUFFIX) + 1], SUFFIX) != 0) - continue; - - /* FIXME - need to use file_list_insert() here to run these in sorted order... */ - snprintf(filename, sizeof(filename), "%s%s", dirname, entry->d_name); - filename[sizeof(filename)-1] = '\0'; - run_program(filename); - } - - closedir(directory); -} - -/* runs files in these directories in order: - * name given by udev - * subsystem - * default +/* + * runs files in these directories in order: + * / + * subsystem/ + * default/ */ void dev_d_send(struct udevice *dev, char *subsystem) { @@ -112,15 +70,15 @@ void dev_d_send(struct udevice *dev, char *subsystem) strfieldcat(devnode, dev->name); setenv("DEVNODE", devnode, 1); - snprintf(dirname, sizeof(dirname), HOTPLUGDIR "/%s/", dev->name); - dirname[sizeof(dirname)-1] = '\0'; - execute_dir(dirname); + strcpy(dirname, DEVD_DIR); + strfieldcat(dirname, dev->name); + call_foreach_file(run_program, dirname, DEVD_SUFFIX); - snprintf(dirname, sizeof(dirname), HOTPLUGDIR "/%s/", subsystem); - dirname[sizeof(dirname)-1] = '\0'; - execute_dir(dirname); + strcpy(dirname, DEVD_DIR); + strfieldcat(dirname, subsystem); + call_foreach_file(run_program, dirname, DEVD_SUFFIX); - strcpy(dirname, HOTPLUGDIR "/default/"); - execute_dir(dirname); + strcpy(dirname, DEVD_DIR "default"); + call_foreach_file(run_program, dirname, DEVD_SUFFIX); } -- cgit v1.2.3-54-g00ecf