chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused includes
[elogind.git]
/
src
/
udev
/
udevadm.c
diff --git
a/src/udev/udevadm.c
b/src/udev/udevadm.c
index 1c06c1aacdaefabb0a88426161135b6a9d7e8b97..b86d8921f36a68c7a6865ce38cc2bab374d6a6c3 100644
(file)
--- a/
src/udev/udevadm.c
+++ b/
src/udev/udevadm.c
@@
-1,3
+1,4
@@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*
* Copyright (C) 2007-2012 Kay Sievers <kay@vrfy.org>
*
/*
* Copyright (C) 2007-2012 Kay Sievers <kay@vrfy.org>
*
@@
-15,22
+16,14
@@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <unistd.h>
#include <stdio.h>
#include <stdio.h>
-#include <stdlib.h>
#include <stddef.h>
#include <stddef.h>
-#include <string.h>
#include <errno.h>
#include <getopt.h>
#include <errno.h>
#include <getopt.h>
+#include "selinux-util.h"
#include "udev.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;
static int adm_version(struct udev *udev, int argc, char *argv[]) {
printf("%s\n", VERSION);
return 0;
@@
-64,11
+57,14
@@
static const struct udevadm_cmd *udevadm_cmds[] = {
static int adm_help(struct udev *udev, int argc, char *argv[]) {
unsigned int i;
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)
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;
}
return 0;
}
@@
-89,7
+85,7
@@
int main(int argc, char *argv[]) {
};
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)
udev = udev_new();
if (udev == NULL)
@@
-97,35
+93,31
@@
int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
log_parse_environment();
log_open();
- udev_set_log_fn(udev, udev_main_log);
- label_init("/dev");
+ mac_selinux_init("/dev");
- 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);
case 'd':
log_set_max_level(LOG_DEBUG);
- udev_set_log_priority(udev, LOG_DEBUG);
break;
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++)
{
+ for (i = 0; i < ELEMENTSOF(udevadm_cmds); i++)
if (streq(udevadm_cmds[i]->name, command)) {
argc -= optind;
argv += optind;
if (streq(udevadm_cmds[i]->name, command)) {
argc -= optind;
argv += optind;
@@
-134,13
+126,11
@@
int main(int argc, char *argv[]) {
rc = run_command(udev, udevadm_cmds[i], argc, argv);
goto out;
}
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;