X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevadm.c;h=b86d8921f36a68c7a6865ce38cc2bab374d6a6c3;hb=113b3fc1a8061f4a24dd0db74e9a3cd0083b2251;hp=2c11550467b9eac67aa33c719b6fcec2db4fa863;hpb=601185b43da638b1c74153deae01dbd518680889;p=elogind.git
diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index 2c1155046..b86d8921f 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -16,22 +16,14 @@
* along with this program. If not, see .
*/
-#include
#include
-#include
#include
-#include
#include
#include
+#include "selinux-util.h"
#include "udev.h"
-void udev_main_log(struct udev *udev, int priority,
- const char *file, int line, const char *fn,
- const char *format, va_list args) {
- log_metav(priority, file, line, fn, format, args);
-}
-
static int adm_version(struct udev *udev, int argc, char *argv[]) {
printf("%s\n", VERSION);
return 0;
@@ -65,11 +57,14 @@ static const struct udevadm_cmd *udevadm_cmds[] = {
static int adm_help(struct udev *udev, int argc, char *argv[]) {
unsigned int i;
- fprintf(stderr, "Usage: udevadm [--help] [--version] [--debug] COMMAND [COMMAND OPTIONS]\n");
+ printf("%s [--help] [--version] [--debug] COMMAND [COMMAND OPTIONS]\n\n"
+ "Send control commands or test the device manager.\n\n"
+ "Commands:\n"
+ , program_invocation_short_name);
+
for (i = 0; i < ELEMENTSOF(udevadm_cmds); i++)
if (udevadm_cmds[i]->help != NULL)
- printf(" %-12s %s\n", udevadm_cmds[i]->name, udevadm_cmds[i]->help);
- fprintf(stderr, "\n");
+ printf(" %-12s %s\n", udevadm_cmds[i]->name, udevadm_cmds[i]->help);
return 0;
}
@@ -98,15 +93,13 @@ int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
- udev_set_log_fn(udev, udev_main_log);
- label_init("/dev");
+ mac_selinux_init("/dev");
while ((c = getopt_long(argc, argv, "+dhV", options, NULL)) >= 0)
switch (c) {
case 'd':
log_set_max_level(LOG_DEBUG);
- udev_set_log_priority(udev, LOG_DEBUG);
break;
case 'h':
@@ -134,10 +127,10 @@ int main(int argc, char *argv[]) {
goto out;
}
- fprintf(stderr, "%s: missing or unknown command", program_invocation_short_name);
+ fprintf(stderr, "%s: missing or unknown command\n", program_invocation_short_name);
rc = 2;
out:
- label_finish();
+ mac_selinux_finish();
udev_unref(udev);
log_close();
return rc;