chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update RELEASE-NOTES
[elogind.git]
/
udevtest.c
diff --git
a/udevtest.c
b/udevtest.c
index 388818d495ce25a7cf5635d71cc7d4ef6bd3e481..3e17b947153604324d67226805a993530eca5601 100644
(file)
--- a/
udevtest.c
+++ b/
udevtest.c
@@
-1,5
+1,5
@@
/*
/*
- * udev.c
+ * udev
test
.c
*
* Userspace devfs
*
*
* Userspace devfs
*
@@
-26,22
+26,25
@@
#include <errno.h>
#include <ctype.h>
#include <signal.h>
#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 "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"
#include "logging.h"
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
-void log_message (int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message (int priority, const char *format, ...)
{
va_list args;
{
va_list args;
+ if (priority > udev_log_priority)
+ return;
+
va_start(args, format);
vprintf(format, args);
va_end(args);
va_start(args, format);
vprintf(format, args);
va_end(args);
@@
-52,68
+55,70
@@
void log_message (int level, const char *format, ...)
int main(int argc, char *argv[], char *envp[])
{
int main(int argc, char *argv[], char *envp[])
{
+ struct udev_rules rules;
struct sysfs_class_device *class_dev;
char *devpath;
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);
struct udevice udev;
char *subsystem = NULL;
info("version %s", UDEV_VERSION);
- if (argc < 2 || argc > 3) {
- info("Usage: udevtest <devpath> [subsystem]");
- return 1;
- }
-
/* initialize our configuration */
udev_init_config();
/* initialize our configuration */
udev_init_config();
+ if (udev_log_priority < LOG_INFO)
+ udev_log_priority = LOG_INFO;
+
+ if (argc != 3) {
+ info("Usage: udevtest <devpath> <subsystem>");
+ return 1;
+ }
/* remove sysfs_path if given */
/* 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)] ;
devpath = &argv[1][strlen(sysfs_path)] ;
- }
else
if (argv[1][0] != '/') {
/* prepend '/' if missing */
else
if (argv[1][0] != '/') {
/* prepend '/' if missing */
- s
trfieldcpy(temp, "/"
);
-
strfieldcat(temp, argv[1])
;
+ s
nprintf(temp, sizeof(temp), "/%s", argv[1]
);
+
temp[sizeof(temp)-1] = '\0'
;
devpath = temp;
devpath = temp;
- } else
{
+ } else
devpath = argv[1];
devpath = argv[1];
- }
- info("looking at '%s'", devpath);
+ subsystem = argv[2];
+ setenv("DEVPATH", devpath, 1);
+ setenv("SUBSYSTEM", subsystem, 1);
+ setenv("ACTION", "add", 1);
+ info("looking at device '%s' from subsystem '%s'", devpath, subsystem);
/* initialize the naming deamon */
/* initialize the naming deamon */
- namedev_init();
-
- if (argc == 3)
- subsystem = argv[2];
+ udev_rules_init(&rules, 0);
/* fill in values and test_run flag*/
/* fill in values and test_run flag*/
- udev_init_device(&udev, devpath, subsystem);
-
- /* skip subsystems without "dev", but handle net devices */
- if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
- info("don't care about '%s' devices", udev.subsystem);
- return 2;
- }
+ udev_init_device(&udev, devpath, subsystem, "add");
/* open the device */
/* 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");
return 1;
}
class_dev = sysfs_open_class_device_path(path);
if (class_dev == NULL) {
info("sysfs_open_class_device_path failed");
return 1;
}
-
info("opened class_dev->name='%s'", class_dev->name);
info("opened class_dev->name='%s'", class_dev->name);
+ if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS)
+ udev.devt = get_devt(class_dev);
+
/* simulate node creation with test flag */
udev.test_run = 1;
/* simulate node creation with test flag */
udev.test_run = 1;
- udev_add_device(&udev, class_dev);
-
+ if (udev.type == DEV_NET || udev.devt) {
+ udev_rules_get_name(&rules, &udev, class_dev);
+ udev_add_device(&udev, class_dev);
+ } else
+ info("only char and block devices with a dev-file are supported by this test program");
sysfs_close_class_device(class_dev);
return 0;
sysfs_close_class_device(class_dev);
return 0;