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] remove PLACE key match
[elogind.git]
/
udevtest.c
diff --git
a/udevtest.c
b/udevtest.c
index 38e2bb7562348c54168050a5d8de932d13228bf8..5ce257005804460dbaf35cfd3bcb0a6d74cf0294 100644
(file)
--- a/
udevtest.c
+++ b/
udevtest.c
@@
-1,5
+1,5
@@
/*
/*
- * udev.c
+ * udev
test
.c
*
* Userspace devfs
*
*
* Userspace devfs
*
@@
-29,14
+29,14
@@
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.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 "logging.h"
#include "udev_utils.h"
#include "udev_version.h"
#include "namedev.h"
#include "logging.h"
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
+#ifdef USE_LOG
void log_message (int level, const char *format, ...)
{
va_list args;
void log_message (int level, const char *format, ...)
{
va_list args;
@@
-53,8
+53,8
@@
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 path[
PATH_SIZE
];
+ char temp[
PATH
_SIZE];
struct udevice udev;
char *subsystem = NULL;
struct udevice udev;
char *subsystem = NULL;
@@
-69,27
+69,19
@@
int main(int argc, char *argv[], char *envp[])
udev_init_config();
/* remove sysfs_path if given */
udev_init_config();
/* 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);
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 the naming deamon */
namedev_init();
/* initialize the naming deamon */
namedev_init();
@@
-99,15
+91,22
@@
int main(int argc, char *argv[], char *envp[])
/* fill in values and test_run flag*/
udev_init_device(&udev, devpath, subsystem);
/* fill in values and test_run flag*/
udev_init_device(&udev, devpath, subsystem);
+ /* skip subsystems without "dev", but handle net devices */
+ if (udev.type != 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;