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 hwdb: Support shipping pre-compiled database in system images
[elogind.git]
/
src
/
udev
/
udevadm-trigger.c
diff --git
a/src/udev/udevadm-trigger.c
b/src/udev/udevadm-trigger.c
index 3608c35cd03f7147d071097961e57f82e86b2082..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>
@@
-32,13
+31,13
@@
#include <sys/un.h>
#include "udev.h"
#include <sys/un.h>
#include "udev.h"
+#include "udev-util.h"
#include "util.h"
static int verbose;
static int dry_run;
#include "util.h"
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)) {
@@
-50,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);
@@
-92,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' },
@@
-115,15
+112,12
@@
static int adm_trigger(struct udev *udev, int argc, char *argv[])
TYPE_SUBSYSTEMS,
} device_type = TYPE_DEVICES;
const char *action = "change";
TYPE_SUBSYSTEMS,
} device_type = TYPE_DEVICES;
const char *action = "change";
- struct udev_enumerate *udev_enumerate;
- int rc = 0;
+ _cleanup_udev_enumerate_unref_ struct udev_enumerate *udev_enumerate = NULL;
int c;
udev_enumerate = udev_enumerate_new(udev);
int c;
udev_enumerate = udev_enumerate_new(udev);
- if (udev_enumerate == NULL) {
- rc = 1;
- goto exit;
- }
+ if (udev_enumerate == NULL)
+ return 1;
while ((c = getopt_long(argc, argv, "vno:t:c:s:S:a:A:p:g:y:b:h", options, NULL)) >= 0) {
const char *key;
while ((c = getopt_long(argc, argv, "vno:t:c:s:S:a:A:p:g:y:b:h", options, NULL)) >= 0) {
const char *key;
@@
-138,24
+132,22
@@
static int adm_trigger(struct udev *udev, int argc, char *argv[])
dry_run = 1;
break;
case 't':
dry_run = 1;
break;
case 't':
- if (streq(optarg, "devices"))
{
+ if (streq(optarg, "devices"))
device_type = TYPE_DEVICES;
device_type = TYPE_DEVICES;
- } else if (streq(optarg, "subsystems")) {
+ else if (streq(optarg, "subsystems"))
device_type = TYPE_SUBSYSTEMS;
device_type = TYPE_SUBSYSTEMS;
- } else {
- log_error("unknown type --type=%s\n", optarg);
- rc = 2;
- goto exit;
+ else {
+ log_error("unknown type --type=%s", optarg);
+ return 2;
}
break;
case 'c':
if (!nulstr_contains("add\0" "remove\0" "change\0", optarg)) {
}
break;
case 'c':
if (!nulstr_contains("add\0" "remove\0" "change\0", optarg)) {
- log_error("unknown action '%s'\n", optarg);
- rc = 2;
- goto exit;
- } else {
+ log_error("unknown action '%s'", optarg);
+ return 2;
+ } else
action = optarg;
action = optarg;
- }
+
break;
case 's':
udev_enumerate_add_match_subsystem(udev_enumerate, optarg);
break;
case 's':
udev_enumerate_add_match_subsystem(udev_enumerate, optarg);
@@
-193,9
+185,8
@@
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);
- rc = 2;
- goto exit;
+ log_error("unable to open the device '%s'", optarg);
+ return 2;
}
udev_enumerate_add_match_parent(udev_enumerate, dev);
/* drop reference immediately, enumerate pins the device as long as needed */
}
udev_enumerate_add_match_parent(udev_enumerate, dev);
/* drop reference immediately, enumerate pins the device as long as needed */
@@
-204,10
+195,9
@@
static int adm_trigger(struct udev *udev, int argc, char *argv[])
}
case 'h':
help();
}
case 'h':
help();
-
goto exit
;
+
return 0
;
case '?':
case '?':
- rc = 1;
- goto exit;
+ return 1;
default:
assert_not_reached("Unknown option");
}
default:
assert_not_reached("Unknown option");
}
@@
-222,17
+212,14
@@
static int adm_trigger(struct udev *udev, int argc, char *argv[])
case TYPE_SUBSYSTEMS:
udev_enumerate_scan_subsystems(udev_enumerate);
exec_list(udev_enumerate, action);
case TYPE_SUBSYSTEMS:
udev_enumerate_scan_subsystems(udev_enumerate);
exec_list(udev_enumerate, action);
-
goto exit
;
+
return 0
;
case TYPE_DEVICES:
udev_enumerate_scan_devices(udev_enumerate);
exec_list(udev_enumerate, action);
case TYPE_DEVICES:
udev_enumerate_scan_devices(udev_enumerate);
exec_list(udev_enumerate, action);
-
goto exit
;
+
return 0
;
default:
assert_not_reached("device_type");
}
default:
assert_not_reached("device_type");
}
-exit:
- udev_enumerate_unref(udev_enumerate);
- return rc;
}
const struct udevadm_cmd udevadm_trigger = {
}
const struct udevadm_cmd udevadm_trigger = {