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: link-config - fix crash due to missing hwaddr
[elogind.git]
/
src
/
udev
/
udevadm-test.c
diff --git
a/src/udev/udevadm-test.c
b/src/udev/udevadm-test.c
index 2d8aa7913e517cde70705a2df3b4aa26953762a4..848604981426dca8a75325ace32539e30f8293f3 100644
(file)
--- a/
src/udev/udevadm-test.c
+++ b/
src/udev/udevadm-test.c
@@
-25,25
+25,23
@@
#include <ctype.h>
#include <fcntl.h>
#include <signal.h>
#include <ctype.h>
#include <fcntl.h>
#include <signal.h>
-#include <syslog.h>
#include <getopt.h>
#include <sys/signalfd.h>
#include "udev.h"
#include <getopt.h>
#include <sys/signalfd.h>
#include "udev.h"
+#include "udev-util.h"
-static int adm_test(struct udev *udev, int argc, char *argv[])
-{
+static int adm_test(struct udev *udev, int argc, char *argv[]) {
int resolve_names = 1;
char filename[UTIL_PATH_SIZE];
const char *action = "add";
const char *syspath = NULL;
int resolve_names = 1;
char filename[UTIL_PATH_SIZE];
const char *action = "add";
const char *syspath = NULL;
- struct udev_event *event = NULL;
- struct udev_device *dev = NULL;
- struct udev_rules *rules = NULL;
struct udev_list_entry *entry;
struct udev_list_entry *entry;
+ _cleanup_udev_rules_unref_ struct udev_rules *rules = NULL;
+ _cleanup_udev_device_unref_ struct udev_device *dev = NULL;
+ _cleanup_udev_event_unref_ struct udev_event *event = NULL;
sigset_t mask, sigmask_orig;
sigset_t mask, sigmask_orig;
- int err;
- int rc = 0;
+ int rc = 0, c;
static const struct option options[] = {
{ "action", required_argument, NULL, 'a' },
static const struct option options[] = {
{ "action", required_argument, NULL, 'a' },
@@
-52,43
+50,40
@@
static int adm_test(struct udev *udev, int argc, char *argv[])
{}
};
{}
};
- log_debug("version %s
\n
", VERSION);
+ log_debug("version %s", VERSION);
- for (;;) {
- int option;
-
- option = getopt_long(argc, argv, "a:s:N:fh", options, NULL);
- if (option == -1)
- break;
-
- switch (option) {
+ while((c = getopt_long(argc, argv, "a:N:h", options, NULL)) >= 0)
+ switch (c) {
case 'a':
action = optarg;
break;
case 'N':
case 'a':
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");
- log_error("resolve-names must be early, late or never
\n
");
+ log_error("resolve-names must be early, late or never");
exit(EXIT_FAILURE);
}
break;
case 'h':
printf("Usage: udevadm test OPTIONS <syspath>\n"
exit(EXIT_FAILURE);
}
break;
case 'h':
printf("Usage: udevadm test OPTIONS <syspath>\n"
- " --action=<string> set action string\n"
- " --help\n\n");
+ " -a,--action=ACTION set action string\n"
+ " -N,--resolve-names=early|late|never when to resolve names\n"
+ " -h,--help print this help string\n"
+ "\n");
exit(EXIT_SUCCESS);
exit(EXIT_SUCCESS);
-
default
:
+
case '?'
:
exit(EXIT_FAILURE);
exit(EXIT_FAILURE);
+ default:
+ assert_not_reached("Unknown option");
}
}
- }
- syspath = argv[optind];
+ syspath = argv[optind];
if (syspath == NULL) {
fprintf(stderr, "syspath parameter missing\n");
rc = 2;
if (syspath == NULL) {
fprintf(stderr, "syspath parameter missing\n");
rc = 2;
@@
-113,9
+108,9
@@
static int adm_test(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);
@@
-141,25
+136,20
@@
static int adm_test(struct udev *udev, int argc, char *argv[])
goto out;
}
goto out;
}
-
err = udev_event_execute_rules(event
, rules, &sigmask_orig);
+
udev_event_execute_rules(event, 30 * USEC_PER_SEC
, rules, &sigmask_orig);
udev_list_entry_foreach(entry, udev_device_get_properties_list_entry(dev))
printf("%s=%s\n", udev_list_entry_get_name(entry), udev_list_entry_get_value(entry));
udev_list_entry_foreach(entry, udev_device_get_properties_list_entry(dev))
printf("%s=%s\n", udev_list_entry_get_name(entry), udev_list_entry_get_value(entry));
- if (err == 0) {
- udev_list_entry_foreach(entry, udev_list_get_entry(&event->run_list)) {
- char program[UTIL_PATH_SIZE];
+ udev_list_entry_foreach(entry, udev_list_get_entry(&event->run_list)) {
+ char program[UTIL_PATH_SIZE];
- udev_event_apply_format(event, udev_list_entry_get_name(entry), program, sizeof(program));
- printf("run: '%s'\n", program);
- }
+ udev_event_apply_format(event, udev_list_entry_get_name(entry), program, sizeof(program));
+ printf("run: '%s'\n", program);
}
out:
if (event != NULL && event->fd_signal >= 0)
close(event->fd_signal);
}
out:
if (event != NULL && event->fd_signal >= 0)
close(event->fd_signal);
- udev_event_unref(event);
- udev_device_unref(dev);
- udev_rules_unref(rules);
udev_builtin_exit(udev);
return rc;
}
udev_builtin_exit(udev);
return rc;
}