#include <unistd.h>
#include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_utils.h"
#include "udev_sysfs.h"
#include "logging.h"
-#ifdef LOG
+#ifdef USE_LOG
void log_message(int level, const char *format, ...)
{
va_list args;
struct sysfs_class_device *class_dev;
struct sysfs_device *devices_dev;
struct udevice udev;
- char path[SYSFS_PATH_MAX];
+ char path[PATH_SIZE];
const char *error;
const char *action;
const char *devpath;
/* trigger timeout to prevent hanging processes */
alarm(ALARM_TIMEOUT);
- if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
- dbg("udevstart");
-
- /* disable all logging, as it's much too slow on some facilities */
- udev_log = 0;
-
- namedev_init();
- retval = udev_start();
- goto exit;
- }
-
/* let the executed programs know if we handle the whole hotplug event */
managed_event = manage_hotplug_event();
if (managed_event)
goto hotplug;
}
- snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+ snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
+ path[sizeof(path)-1] = '\0';
class_dev = wait_class_device_open(path);
if (class_dev == NULL) {
dbg ("open class device failed");
/* wait for sysfs */
dbg("devices add");
- snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath);
+ snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath);
+ path[sizeof(path)-1] = '\0';
devices_dev = wait_devices_device_open(path);
if (!devices_dev) {
dbg("devices device unavailable (probably remove has beaten us)");
if (udev_hotplug_d && managed_event)
udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
-exit:
logging_close();
return retval;
}