dbg("fork of helper failed");
return -1;
default:
- wait(NULL);
+ waitpid(pid, NULL, 0);
}
return 0;
}
switch (pid) {
case 0:
/* child */
- execl(UDEV_BIN, "udev", subsystem, NULL);
+ execl(UDEV_BIN, UDEV_BIN, subsystem, NULL);
dbg("exec of child failed");
- exit(1);
+ _exit(1);
break;
case -1:
dbg("fork of child failed");
break;
default:
- wait(NULL);
+ waitpid(pid, NULL, 0);
}
}
unsigned long long seq;
int retval = 1;
int loop;
- struct timespec tspec;
int sock = -1;
struct sockaddr_un saddr;
socklen_t addrlen;
int started_daemon = 0;
- init_logging("udevsend");
+ logging_init("udevsend");
dbg("version %s", UDEV_VERSION);
subsystem = get_subsystem(argv[1]);
strfieldcpy(msg.subsystem, subsystem);
/* If we can't send, try to start daemon and resend message */
- loop = UDEVSEND_CONNECT_RETRY;
- while (loop--) {
+ loop = SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND;
+ while (--loop) {
retval = sendto(sock, &msg, sizeof(struct hotplug_msg), 0,
(struct sockaddr *)&saddr, addrlen);
if (retval != -1) {
}
if (!started_daemon) {
- info("starting udevd daemon");
+ dbg("try to start udevd daemon");
retval = start_daemon();
if (retval) {
info("error starting daemon");
goto fallback;
}
- dbg("daemon started");
+ info("udevd daemon started");
started_daemon = 1;
} else {
- dbg("retry to connect %d", UDEVSEND_CONNECT_RETRY - loop);
- tspec.tv_sec = 0;
- tspec.tv_nsec = 100000000; /* 100 millisec */
- nanosleep(&tspec, NULL);
+ dbg("retry to connect %d", SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND - loop);
+ usleep(1000 * 1000 / SEND_WAIT_LOOP_PER_SECOND);
}
}
if (sock != -1)
close(sock);
+ logging_close();
+
return retval;
}