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] add ENV{} key to match agains environment variables
[elogind.git]
/
udevtest.c
diff --git
a/udevtest.c
b/udevtest.c
index 4e02ac7dbc2b4f351947c1793a31d68ba405a11e..006d55510e3aa1b84e6e189b5d0b9ec343361502 100644
(file)
--- a/
udevtest.c
+++ b/
udevtest.c
@@
-1,5
+1,5
@@
/*
/*
- * udev.c
+ * udev
test
.c
*
* Userspace devfs
*
*
* Userspace devfs
*
@@
-32,11
+32,11
@@
#include "udev_sysfs.h"
#include "udev_utils.h"
#include "udev_version.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
+#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,23
+69,21
@@
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);
/* initialize the naming deamon */
info("looking at '%s'", devpath);
/* initialize the naming deamon */
-
namedev
_init();
+
udev_rules
_init();
if (argc == 3)
subsystem = argv[2];
if (argc == 3)
subsystem = argv[2];
@@
-94,13
+92,14
@@
int main(int argc, char *argv[], char *envp[])
udev_init_device(&udev, devpath, subsystem);
/* skip subsystems without "dev", but handle net devices */
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 */
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");
class_dev = sysfs_open_class_device_path(path);
if (class_dev == NULL) {
info("sysfs_open_class_device_path failed");