chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
selinux: clean up selinux label function naming
[elogind.git]
/
src
/
udev
/
udevadm.c
diff --git
a/src/udev/udevadm.c
b/src/udev/udevadm.c
index fafa31bba45a0e7a75d097a9d283e35faabf7002..7026c50d2b4fe746e6e07ea463db0969d452c9f8 100644
(file)
--- a/
src/udev/udevadm.c
+++ b/
src/udev/udevadm.c
@@
-1,5
+1,6
@@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*
/*
- * Copyright (C) 2007-2012 Kay Sievers <kay
.sievers
@vrfy.org>
+ * Copyright (C) 2007-2012 Kay Sievers <kay@vrfy.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-27,13
+28,11
@@
void udev_main_log(struct udev *udev, int priority,
const char *file, int line, const char *fn,
void udev_main_log(struct udev *udev, int priority,
const char *file, int line, const char *fn,
- const char *format, va_list args)
-{
+ const char *format, va_list args) {
log_metav(priority, file, line, fn, format, args);
}
log_metav(priority, file, line, fn, format, args);
}
-static int adm_version(struct udev *udev, int argc, char *argv[])
-{
+static int adm_version(struct udev *udev, int argc, char *argv[]) {
printf("%s\n", VERSION);
return 0;
}
printf("%s\n", VERSION);
return 0;
}
@@
-56,14
+55,14
@@
static const struct udevadm_cmd *udevadm_cmds[] = {
&udevadm_settle,
&udevadm_control,
&udevadm_monitor,
&udevadm_settle,
&udevadm_control,
&udevadm_monitor,
+ &udevadm_hwdb,
&udevadm_test,
&udevadm_test_builtin,
&udevadm_version,
&udevadm_help,
};
&udevadm_test,
&udevadm_test_builtin,
&udevadm_version,
&udevadm_help,
};
-static int adm_help(struct udev *udev, int argc, char *argv[])
-{
+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");
unsigned int i;
fprintf(stderr, "Usage: udevadm [--help] [--version] [--debug] COMMAND [COMMAND OPTIONS]\n");
@@
-74,16
+73,14
@@
static int adm_help(struct udev *udev, int argc, char *argv[])
return 0;
}
return 0;
}
-static int run_command(struct udev *udev, const struct udevadm_cmd *cmd, int argc, char *argv[])
-{
+static int run_command(struct udev *udev, const struct udevadm_cmd *cmd, int argc, char *argv[]) {
if (cmd->debug)
log_set_max_level(LOG_DEBUG);
if (cmd->debug)
log_set_max_level(LOG_DEBUG);
- log_debug("calling: %s
\n
", cmd->name);
+ log_debug("calling: %s", cmd->name);
return cmd->cmd(udev, argc, argv);
}
return cmd->cmd(udev, argc, argv);
}
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
struct udev *udev;
static const struct option options[] = {
{ "debug", no_argument, NULL, 'd' },
struct udev *udev;
static const struct option options[] = {
{ "debug", no_argument, NULL, 'd' },
@@
-91,61
+88,56
@@
int main(int argc, char *argv[])
{ "version", no_argument, NULL, 'V' },
{}
};
{ "version", no_argument, NULL, 'V' },
{}
};
- const char *prefixes[] = { "/dev", "/run", NULL };
const char *command;
unsigned int i;
const char *command;
unsigned int i;
- int rc = 1;
+ int rc = 1
, c
;
udev = udev_new();
if (udev == NULL)
goto out;
udev = udev_new();
if (udev == NULL)
goto out;
- log_open();
log_parse_environment();
log_parse_environment();
+ log_open();
udev_set_log_fn(udev, udev_main_log);
udev_set_log_fn(udev, udev_main_log);
+ mac_selinux_init("/dev");
- label_init(prefixes);
-
- for (;;) {
- int option;
-
- option = getopt_long(argc, argv, "+dhV", options, NULL);
- if (option == -1)
- break;
+ while ((c = getopt_long(argc, argv, "+dhV", options, NULL)) >= 0)
+ switch (c) {
- switch (option) {
case 'd':
log_set_max_level(LOG_DEBUG);
udev_set_log_priority(udev, LOG_DEBUG);
break;
case 'd':
log_set_max_level(LOG_DEBUG);
udev_set_log_priority(udev, LOG_DEBUG);
break;
+
case 'h':
rc = adm_help(udev, argc, argv);
goto out;
case 'h':
rc = adm_help(udev, argc, argv);
goto out;
+
case 'V':
rc = adm_version(udev, argc, argv);
goto out;
case 'V':
rc = adm_version(udev, argc, argv);
goto out;
+
default:
goto out;
}
default:
goto out;
}
- }
+
command = argv[optind];
if (command != NULL)
command = argv[optind];
if (command != NULL)
- for (i = 0; i < ELEMENTSOF(udevadm_cmds); i++)
{
- if (str
cmp(udevadm_cmds[i]->name, command) == 0
) {
+ for (i = 0; i < ELEMENTSOF(udevadm_cmds); i++)
+ if (str
eq(udevadm_cmds[i]->name, command)
) {
argc -= optind;
argv += optind;
argc -= optind;
argv += optind;
+ /* we need '0' here to reset the internal state */
optind = 0;
rc = run_command(udev, udevadm_cmds[i], argc, argv);
goto out;
}
optind = 0;
rc = run_command(udev, udevadm_cmds[i], argc, argv);
goto out;
}
- }
- fprintf(stderr, "missing or unknown command\n\n");
- adm_help(udev, argc, argv);
+ fprintf(stderr, "%s: missing or unknown command\n", program_invocation_short_name);
rc = 2;
out:
rc = 2;
out:
-
label
_finish();
+
mac_selinux
_finish();
udev_unref(udev);
log_close();
return rc;
udev_unref(udev);
log_close();
return rc;