chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: udevd - rules can be NULL when reloading
[elogind.git]
/
src
/
udev
/
udevadm-test.c
diff --git
a/src/udev/udevadm-test.c
b/src/udev/udevadm-test.c
index 0c8a762540fe49b3e29b662390bb42e3516dea5a..df1409bff64cdcb2c8a2f40e19b2036aecdb7b1e 100644
(file)
--- a/
src/udev/udevadm-test.c
+++ b/
src/udev/udevadm-test.c
@@
-1,6
+1,6
@@
/*
* Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
/*
* Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004-2008 Kay Sievers <kay
.sievers
@vrfy.org>
+ * Copyright (C) 2004-2008 Kay Sievers <kay@vrfy.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-66,11
+66,11
@@
static int adm_test(struct udev *udev, int argc, char *argv[])
action = optarg;
break;
case 'N':
action = optarg;
break;
case 'N':
- if (str
cmp (optarg, "early") == 0
) {
+ if (str
eq (optarg, "early")
) {
resolve_names = 1;
resolve_names = 1;
- } else if (str
cmp (optarg, "late") == 0
) {
+ } else if (str
eq (optarg, "late")
) {
resolve_names = 0;
resolve_names = 0;
- } else if (str
cmp (optarg, "never") == 0
) {
+ } else if (str
eq (optarg, "never")
) {
resolve_names = -1;
} else {
fprintf(stderr, "resolve-names must be early, late or never\n");
resolve_names = -1;
} else {
fprintf(stderr, "resolve-names must be early, late or never\n");
@@
-112,10
+112,10
@@
static int adm_test(struct udev *udev, int argc, char *argv[])
}
/* add /sys if needed */
}
/* add /sys if needed */
- if (
strncmp(syspath, "/sys", strlen("/sys")) != 0
)
-
util_
strscpyl(filename, sizeof(filename), "/sys", syspath, NULL);
+ if (
!startswith(syspath, "/sys")
)
+ strscpyl(filename, sizeof(filename), "/sys", syspath, NULL);
else
else
-
util_
strscpy(filename, sizeof(filename), syspath);
+ strscpy(filename, sizeof(filename), syspath);
util_remove_trailing_chars(filename, '/');
dev = udev_device_new_from_syspath(udev, filename);
util_remove_trailing_chars(filename, '/');
dev = udev_device_new_from_syspath(udev, filename);