/*
- * udev.c
+ * udevtest.c
*
* Userspace devfs
*
#include <errno.h>
#include <ctype.h>
#include <signal.h>
+#include <syslog.h>
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
#include "udev_sysfs.h"
#include "udev_utils.h"
#include "udev_version.h"
-#include "namedev.h"
+#include "udev_rules.h"
#include "logging.h"
#ifdef USE_LOG
-void log_message (int level, const char *format, ...)
+void log_message (int priority, const char *format, ...)
{
va_list args;
+ if (priority > udev_log_priority)
+ return;
+
va_start(args, format);
vprintf(format, args);
va_end(args);
{
struct sysfs_class_device *class_dev;
char *devpath;
- char path[SYSFS_PATH_MAX];
- char temp[NAME_SIZE];
+ char path[PATH_SIZE];
+ char temp[PATH_SIZE];
struct udevice udev;
char *subsystem = NULL;
info("version %s", UDEV_VERSION);
- if (argc < 2 || argc > 3) {
- info("Usage: udevtest <devpath> [subsystem]");
+ if (argc != 3) {
+ info("Usage: udevtest <devpath> <subsystem>");
return 1;
}
/* initialize our configuration */
udev_init_config();
+ if (udev_log_priority < LOG_INFO)
+ udev_log_priority = LOG_INFO;
/* remove sysfs_path if given */
- if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) {
+ if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
devpath = &argv[1][strlen(sysfs_path)] ;
- }
else
if (argv[1][0] != '/') {
/* prepend '/' if missing */
- strfieldcpy(temp, "/");
- strfieldcat(temp, argv[1]);
+ snprintf(temp, sizeof(temp), "/%s", argv[1]);
+ temp[sizeof(temp)-1] = '\0';
devpath = temp;
- } else {
+ } else
devpath = argv[1];
- }
info("looking at '%s'", devpath);
/* initialize the naming deamon */
- namedev_init();
+ udev_rules_init();
if (argc == 3)
subsystem = argv[2];
udev_init_device(&udev, devpath, subsystem);
/* skip subsystems without "dev", but handle net devices */
- if (udev.type != NET && subsystem_expect_no_dev(udev.subsystem)) {
+ if (udev.type != DEV_NET && subsystem_expect_no_dev(udev.subsystem)) {
info("don't care about '%s' devices", udev.subsystem);
return 2;
}
/* open the device */
- 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 = sysfs_open_class_device_path(path);
if (class_dev == NULL) {
info("sysfs_open_class_device_path failed");