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] 047 release
[elogind.git]
/
udevtest.c
diff --git
a/udevtest.c
b/udevtest.c
index e67af0df673fb05dd3378afb056f95f79f7dd697..38e2bb7562348c54168050a5d8de932d13228bf8 100644
(file)
--- a/
udevtest.c
+++ b/
udevtest.c
@@
-29,14
+29,10
@@
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
-#include "udev_
lib
.h"
+#include "udev_
utils
.h"
#include "udev_version.h"
#include "udev_version.h"
-#include "logging.h"
#include "namedev.h"
#include "namedev.h"
-
-/* global variables */
-char **main_argv;
-char **main_envp;
+#include "logging.h"
#ifdef LOG
#ifdef LOG
@@
-59,22
+55,23
@@
int main(int argc, char *argv[], char *envp[])
char *devpath;
char path[SYSFS_PATH_MAX];
char temp[NAME_SIZE];
char *devpath;
char path[SYSFS_PATH_MAX];
char temp[NAME_SIZE];
- char *subsystem = "";
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 (arg
v[1] == NULL
) {
- info("
udevinfo expects the DEVPATH of the sysfs device as a argument
");
+ if (arg
c < 2 || argc > 3
) {
+ info("
Usage: udevtest <devpath> [subsystem]
");
return 1;
}
return 1;
}
+ /* initialize our configuration */
+ udev_init_config();
+
/* remove sysfs_path if given */
/* remove sysfs_path if given */
- if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
- devpath = argv[1] + strlen(sysfs_path);
+ if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) {
+ devpath = &argv[1][strlen(sysfs_path)] ;
+ }
else
if (argv[1][0] != '/') {
/* prepend '/' if missing */
else
if (argv[1][0] != '/') {
/* prepend '/' if missing */
@@
-93,17
+90,14
@@
int main(int argc, char *argv[], char *envp[])
return 2;
}
return 2;
}
- /* initialize our configuration */
- udev_init_config();
-
/* initialize the naming deamon */
namedev_init();
/* initialize the naming deamon */
namedev_init();
- if (arg
v[2] != NULL
)
+ if (arg
c == 3
)
subsystem = argv[2];
/* fill in values and test_run flag*/
subsystem = argv[2];
/* fill in values and test_run flag*/
- udev_
set_values(&udev, devpath, subsystem, "add"
);
+ udev_
init_device(&udev, devpath, subsystem
);
/* open the device */
snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
/* open the device */
snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);