chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] fix udevtest to print the error if logging is disabled
[elogind.git]
/
udevtest.c
diff --git
a/udevtest.c
b/udevtest.c
index 8af2120fb16856485036eb467e634b4d927ceedb..93387f76d0b9d8e462a7b1b8a50c3e966353a979 100644
(file)
--- a/
udevtest.c
+++ b/
udevtest.c
@@
-1,5
+1,5
@@
/*
/*
- * udev.c
+ * udev
test
.c
*
* Userspace devfs
*
*
* Userspace devfs
*
@@
-26,25
+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 "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
-#include "udev_lib.h"
+#include "udev_sysfs.h"
+#include "udev_utils.h"
#include "udev_version.h"
#include "udev_version.h"
+#include "udev_rules.h"
#include "logging.h"
#include "logging.h"
-#include "namedev.h"
-/* global variables */
-char **main_argv;
-char **main_envp;
-
-#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);
@@
-57,63
+57,63
@@
int main(int argc, char *argv[], char *envp[])
{
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 *subsystem = "";
+ char path[PATH_SIZE];
+ char temp[PATH_SIZE];
struct udevice udev;
struct udevice udev;
-
- main_argv = argv;
- main_envp = envp;
+ char *subsystem = NULL;
info("version %s", UDEV_VERSION);
info("version %s", UDEV_VERSION);
- if (argv[1] == NULL) {
- info("udevinfo expects the DEVPATH of the sysfs device as a argument");
+ /* 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 */
if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
return 1;
}
/* remove sysfs_path if given */
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);
-
- /* we only care about class devices and block stuff */
- if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
- dbg("not a block or class device");
- return 2;
- }
- /* initialize our configuration */
- udev_init_config();
+ 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 (argv[2] != NULL)
- subsystem = argv[2];
+ udev_rules_init();
/* fill in values and test_run flag*/
/* fill in values and test_run flag*/
- udev_set_values(&udev, devpath, subsystem);
+ udev_init_device(&udev, devpath, subsystem, "add");
+
+ /* skip subsystems without "dev", but handle net devices */
+ 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 */
/* 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;
}
-
dbg
("opened class_dev->name='%s'", class_dev->name);
+
info
("opened class_dev->name='%s'", class_dev->name);
/* simulate node creation with test flag */
udev.test_run = 1;
/* simulate node creation with test flag */
udev.test_run = 1;