#include <string.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <sys/stat.h>
#include <unistd.h>
+#include <fcntl.h>
+
#include "udev.h"
#include "udev_lib.h"
+#include "udevdb.h"
#include "logging.h"
#define DEVD_DIR "/etc/dev.d/"
static int run_program(char *name)
{
pid_t pid;
+ int fd;
+ char *argv[3];
dbg("running %s", name);
switch (pid) {
case 0:
/* child */
- execv(name, main_argv);
+ udevdb_exit(); /* close udevdb */
+ fd = open("/dev/null", O_RDWR);
+ if ( fd >= 0) {
+ dup2(fd, STDOUT_FILENO);
+ dup2(fd, STDIN_FILENO);
+ dup2(fd, STDERR_FILENO);
+ }
+ close(fd);
+
+ argv[0] = name;
+ argv[1] = main_argv[1];
+ argv[2] = NULL;
+
+ execv(name, argv);
dbg("exec of child failed");
- exit(1);
+ _exit(1);
case -1:
dbg("fork of child failed");
break;
* subsystem/
* default/
*/
-void dev_d_send(struct udevice *dev, const char *subsystem, const char *devpath)
+void dev_d_execute(struct udevice *udev)
{
- char dirname[256];
- char env_devname[NAME_SIZE];
- char *devname;
+ char dirname[PATH_MAX];
+ char devname[NAME_SIZE];
char *temp;
+ /* skip if UDEV_NO_DEVD is set */
if (udev_dev_d == 0)
return;
- if (dev->type == 'b' || dev->type == 'c') {
- strfieldcpy(env_devname, udev_root);
- strfieldcat(env_devname, dev->name);
- } else if (dev->type == 'n') {
- strfieldcpy(env_devname, dev->name);
- setenv("DEVPATH", devpath, 1);
- }
- setenv("DEVNAME", env_devname, 1);
- dbg("DEVNAME='%s'", env_devname);
-
- devname = strdup(dev->name);
- if (!devname) {
- dbg("out of memory");
+ /* skip if udev did nothing, like unchanged netif or no "dev" file */
+ if (udev->devname[0] == '\0')
return;
- }
+
+ /* add the node name or the netif name to the environment */
+ setenv("DEVNAME", udev->devname, 1);
+ dbg("DEVNAME='%s'", udev->devname);
+
+ strfieldcpy(devname, udev->name);
/* Chop the device name up into pieces based on '/' */
temp = strchr(devname, '/');
while (temp != NULL) {
- *temp = 0x00;
+ temp[0] = '\0';
strcpy(dirname, DEVD_DIR);
strfieldcat(dirname, devname);
call_foreach_file(run_program, dirname, DEVD_SUFFIX);
- *temp = '/';
+ temp[0] = '/';
++temp;
temp = strchr(temp, '/');
}
strcpy(dirname, DEVD_DIR);
- strfieldcat(dirname, dev->name);
+ strfieldcat(dirname, udev->name);
call_foreach_file(run_program, dirname, DEVD_SUFFIX);
strcpy(dirname, DEVD_DIR);
- strfieldcat(dirname, subsystem);
+ strfieldcat(dirname, udev->subsystem);
call_foreach_file(run_program, dirname, DEVD_SUFFIX);
strcpy(dirname, DEVD_DIR "default");