chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ATTR{}== always fails if the attribute does not exist
[elogind.git]
/
udev
/
udevadm.c
diff --git
a/udev/udevadm.c
b/udev/udevadm.c
index 6de50f42537205d8429472ed864d8d8b19171bdf..2de9fbcf2212680be0474b0553b3f3e39faabfd9 100644
(file)
--- a/
udev/udevadm.c
+++ b/
udev/udevadm.c
@@
-15,8
+15,6
@@
* 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 "config.h"
-
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
@@
-126,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;
@@
-142,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];
@@
-212,7
+210,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;