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-trigger.c
diff --git
a/src/udev/udevadm-trigger.c
b/src/udev/udevadm-trigger.c
index a898ef99e436bec13b950d27b638801a0f7d4e23..a52d1b5ad5072120cad792274d3448ef0d46cf29 100644
(file)
--- a/
src/udev/udevadm-trigger.c
+++ b/
src/udev/udevadm-trigger.c
@@
-24,7
+24,6
@@
#include <errno.h>
#include <dirent.h>
#include <fcntl.h>
#include <errno.h>
#include <dirent.h>
#include <fcntl.h>
-#include <syslog.h>
#include <fnmatch.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <fnmatch.h>
#include <sys/stat.h>
#include <sys/types.h>
@@
-38,8
+37,7
@@
static int verbose;
static int dry_run;
static int verbose;
static int dry_run;
-static void exec_list(struct udev_enumerate *udev_enumerate, const char *action)
-{
+static void exec_list(struct udev_enumerate *udev_enumerate, const char *action) {
struct udev_list_entry *entry;
udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(udev_enumerate)) {
struct udev_list_entry *entry;
udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(udev_enumerate)) {
@@
-51,17
+49,16
@@
static void exec_list(struct udev_enumerate *udev_enumerate, const char *action)
if (dry_run)
continue;
strscpyl(filename, sizeof(filename), udev_list_entry_get_name(entry), "/uevent", NULL);
if (dry_run)
continue;
strscpyl(filename, sizeof(filename), udev_list_entry_get_name(entry), "/uevent", NULL);
- fd = open(filename, O_WRONLY);
+ fd = open(filename, O_WRONLY
|O_CLOEXEC
);
if (fd < 0)
continue;
if (write(fd, action, strlen(action)) < 0)
if (fd < 0)
continue;
if (write(fd, action, strlen(action)) < 0)
- log_debug("error writing '%s' to '%s': %m
\n
", action, filename);
+ log_debug("error writing '%s' to '%s': %m", action, filename);
close(fd);
}
}
close(fd);
}
}
-static const char *keyval(const char *str, const char **val, char *buf, size_t size)
-{
+static const char *keyval(const char *str, const char **val, char *buf, size_t size) {
char *pos;
strscpy(buf, size,str);
char *pos;
strscpy(buf, size,str);
@@
-93,8
+90,7
@@
static void help(void) {
" -h,--help\n\n");
}
" -h,--help\n\n");
}
-static int adm_trigger(struct udev *udev, int argc, char *argv[])
-{
+static int adm_trigger(struct udev *udev, int argc, char *argv[]) {
static const struct option options[] = {
{ "verbose", no_argument, NULL, 'v' },
{ "dry-run", no_argument, NULL, 'n' },
static const struct option options[] = {
{ "verbose", no_argument, NULL, 'v' },
{ "dry-run", no_argument, NULL, 'n' },
@@
-141,13
+137,13
@@
static int adm_trigger(struct udev *udev, int argc, char *argv[])
else if (streq(optarg, "subsystems"))
device_type = TYPE_SUBSYSTEMS;
else {
else if (streq(optarg, "subsystems"))
device_type = TYPE_SUBSYSTEMS;
else {
- log_error("unknown type --type=%s
\n
", optarg);
+ log_error("unknown type --type=%s", optarg);
return 2;
}
break;
case 'c':
if (!nulstr_contains("add\0" "remove\0" "change\0", optarg)) {
return 2;
}
break;
case 'c':
if (!nulstr_contains("add\0" "remove\0" "change\0", optarg)) {
- log_error("unknown action '%s'
\n
", optarg);
+ log_error("unknown action '%s'", optarg);
return 2;
} else
action = optarg;
return 2;
} else
action = optarg;
@@
-189,7
+185,7
@@
static int adm_trigger(struct udev *udev, int argc, char *argv[])
util_remove_trailing_chars(path, '/');
dev = udev_device_new_from_syspath(udev, path);
if (dev == NULL) {
util_remove_trailing_chars(path, '/');
dev = udev_device_new_from_syspath(udev, path);
if (dev == NULL) {
- log_error("unable to open the device '%s'
\n
", optarg);
+ log_error("unable to open the device '%s'", optarg);
return 2;
}
udev_enumerate_add_match_parent(udev_enumerate, dev);
return 2;
}
udev_enumerate_add_match_parent(udev_enumerate, dev);