chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update some message formats
[elogind.git]
/
src
/
udev
/
udevadm-test-builtin.c
diff --git
a/src/udev/udevadm-test-builtin.c
b/src/udev/udevadm-test-builtin.c
index 9853d83b49e6877478c4a389f8f49df8f8a03177..80418783ffd7b7183bbe7dc6663d58c4a34e3d08 100644
(file)
--- a/
src/udev/udevadm-test-builtin.c
+++ b/
src/udev/udevadm-test-builtin.c
@@
-37,7
+37,7
@@
static void help(struct udev *udev)
{
fprintf(stderr, "\n");
static void help(struct udev *udev)
{
fprintf(stderr, "\n");
- fprintf(stderr, "Usage: udevadm builtin [--help]
<command> <syspath>
\n");
+ fprintf(stderr, "Usage: udevadm builtin [--help]
COMMAND SYSPATH
\n");
udev_builtin_list(udev);
fprintf(stderr, "\n");
}
udev_builtin_list(udev);
fprintf(stderr, "\n");
}
@@
-53,21
+53,14
@@
static int adm_builtin(struct udev *udev, int argc, char *argv[])
char filename[UTIL_PATH_SIZE];
struct udev_device *dev = NULL;
enum udev_builtin_cmd cmd;
char filename[UTIL_PATH_SIZE];
struct udev_device *dev = NULL;
enum udev_builtin_cmd cmd;
- int rc = EXIT_SUCCESS;
+ int rc = EXIT_SUCCESS
, c
;
- for (;;) {
- int option;
-
- option = getopt_long(argc, argv, "h", options, NULL);
- if (option == -1)
- break;
-
- switch (option) {
+ while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
+ switch (c) {
case 'h':
help(udev);
goto out;
}
case 'h':
help(udev);
goto out;
}
- }
command = argv[optind++];
if (command == NULL) {
command = argv[optind++];
if (command == NULL) {
@@
-79,7
+72,7
@@
static int adm_builtin(struct udev *udev, int argc, char *argv[])
syspath = argv[optind++];
if (syspath == NULL) {
syspath = argv[optind++];
if (syspath == NULL) {
- fprintf(stderr, "syspath missing\n
\n
");
+ fprintf(stderr, "syspath missing\n");
rc = 3;
goto out;
}
rc = 3;
goto out;
}
@@
-96,9
+89,9
@@
static int adm_builtin(struct udev *udev, int argc, char *argv[])
/* add /sys if needed */
if (!startswith(syspath, "/sys"))
/* add /sys if needed */
if (!startswith(syspath, "/sys"))
-
util_
strscpyl(filename, sizeof(filename), "/sys", syspath, NULL);
+ 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);