[PATCH] DEVPATH for netdev

[elogind.git] / dev_d.c

diff --git a/dev_d.c b/dev_d.c
index 36bee33bd9fbe1e049e4d0b97e5c5d280b2d2a42..483ceb4b1b983f398831a46d8db41aa48f88bd18 100644 (file)
--- 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 <greg@kroah.com>
  *
  *     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 <cborntra@de.ibm.com>
- * which was based on the shell script written by:
- *     Greg Kroah-Hartman <greg@kroah.com>
- *
  */
 
-/* 
+/*
  * 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 <dirent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -35,83 +28,65 @@
 #include "udev_lib.h"
 #include "logging.h"
 
-#define HOTPLUGDIR     "/etc/dev.d"
-#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)
+/* 
+ * runs files in these directories in order:
+ *     <node name given by udev>/
+ *     subsystem/
+ *     default/
+ */
+void dev_d_send(struct udevice *dev, char *subsystem, char *devpath)
 {
-       DIR *directory;
-       struct dirent *entry;
-       char filename[256];
+       char dirname[256];
+       char devname[NAME_SIZE];
 
-       dbg("opening %s", dirname);
-       directory = opendir(dirname);
-       if (!directory)
+       if (udev_dev_d == 0)
                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;
-
-               /* 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);
+       if (dev->type == 'b' || dev->type == 'c') {
+               strfieldcpy(devname, udev_root);
+               strfieldcat(devname, dev->name);
+       } else if (dev->type == 'n') {
+               strfieldcpy(devname, dev->name);
+               setenv("DEVPATH", devpath, 1);
        }
+       setenv("DEVNAME", devname, 1);
+       dbg("DEVNAME='%s'", devname);
 
-       closedir(directory);
-}
+       strcpy(dirname, DEVD_DIR);
+       strfieldcat(dirname, dev->name);
+       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 
-/* runs files in these directories in order:
- *     name given by udev
- *     subsystem
- *     default
- */
-void dev_d_send(struct udevice *dev, char *subsystem)
-{
-       char dirname[256];
-       char devnode[NAME_SIZE];
+       strcpy(dirname, DEVD_DIR);
+       strfieldcat(dirname, subsystem);
+       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 
-       strfieldcpy(devnode, udev_root);
-       strfieldcat(devnode, dev->name);
-       setenv("DEVNODE", devnode, 1);
-
-       snprintf(dirname, sizeof(dirname), HOTPLUGDIR "/%s/", dev->name);
-       dirname[sizeof(dirname)-1] = '\0';
-       execute_dir(dirname);
-
-       snprintf(dirname, sizeof(dirname), HOTPLUGDIR "/%s/", subsystem);
-       dirname[sizeof(dirname)-1] = '\0';
-       execute_dir(dirname);
-
-       strcpy(dirname, HOTPLUGDIR "/default/");
-       execute_dir(dirname);
+       strcpy(dirname, DEVD_DIR "default");
+       call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 }
-