chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vol_id: if regular files are probed, use stat() for the size value
[elogind.git]
/
udev
/
udevadm.c
diff --git
a/udev/udevadm.c
b/udev/udevadm.c
index b18114273c8e839dec6e0ca5a6d82400e270a604..0927981ab284371460cbcb39e66ece82ba154568 100644
(file)
--- a/
udev/udevadm.c
+++ b/
udev/udevadm.c
@@
-124,9
+124,9
@@
int main(int argc, char *argv[])
{
struct udev *udev;
static const struct option options[] = {
{
struct udev *udev;
static const struct option options[] = {
- { "debug",
0
, NULL, 'd' },
- { "help",
0
, NULL, 'h' },
- { "version",
0
, NULL, 'V' },
+ { "debug",
no_argument
, NULL, 'd' },
+ { "help",
no_argument
, NULL, 'h' },
+ { "version",
no_argument
, NULL, 'V' },
{}
};
const char *command;
{}
};
const char *command;
@@
-140,7
+140,7
@@
int main(int argc, char *argv[])
logging_init("udevadm");
udev_set_log_fn(udev, log_fn);
logging_init("udevadm");
udev_set_log_fn(udev, log_fn);
-
sysfs_init(
);
+
udev_selinux_init(udev
);
/* see if we are a compat link, this will be removed in a future release */
command = argv[0];
/* see if we are a compat link, this will be removed in a future release */
command = argv[0];
@@
-200,7
+200,9
@@
int main(int argc, char *argv[])
if (command != NULL)
for (i = 0; cmds[i].cmd != NULL; i++) {
if (strcmp(cmds[i].name, command) == 0) {
if (command != NULL)
for (i = 0; cmds[i].cmd != NULL; i++) {
if (strcmp(cmds[i].name, command) == 0) {
- optind++;
+ argc -= optind;
+ argv += optind;
+ optind = 0;
rc = run_command(udev, &cmds[i], argc, argv);
goto out;
}
rc = run_command(udev, &cmds[i], argc, argv);
goto out;
}
@@
-210,7
+212,7
@@
int main(int argc, char *argv[])
help(udev, argc, argv);
rc = 2;
out:
help(udev, argc, argv);
rc = 2;
out:
-
sysfs_cleanup(
);
+
udev_selinux_exit(udev
);
udev_unref(udev);
logging_close();
return rc;
udev_unref(udev);
logging_close();
return rc;