chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: make ata_id properties the default for all ATA block devices
[elogind.git]
/
udev
/
test-udev.c
diff --git
a/udev/test-udev.c
b/udev/test-udev.c
index 1cc83c4a694886ef0cae01c3eceeb5f951abc507..c6b8bf573ba774b7d7464906cff1a42f1935fca3 100644
(file)
--- a/
udev/test-udev.c
+++ b/
udev/test-udev.c
@@
-30,14
+30,14
@@
#include "udev.h"
#include "udev.h"
-static void
asmlinkage
sig_handler(int signum)
+static void sig_handler(int signum)
{
switch (signum) {
case SIGALRM:
{
switch (signum) {
case SIGALRM:
- exit(1);
+
_
exit(1);
case SIGINT:
case SIGTERM:
case SIGINT:
case SIGTERM:
- exit(20 + signum);
+
_
exit(20 + signum);
}
}
}
}
@@
-58,11
+58,11
@@
int main(int argc, char *argv[])
if (udev == NULL)
exit(1);
info(udev, "version %s\n", VERSION);
if (udev == NULL)
exit(1);
info(udev, "version %s\n", VERSION);
- selinux_init(udev);
+
udev_
selinux_init(udev);
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
- act.sa_handler =
(void (*)(int))
sig_handler;
+ act.sa_handler = sig_handler;
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);
@@
-81,10
+81,9
@@
int main(int argc, char *argv[])
goto exit;
}
goto exit;
}
- rules = udev_rules_new(udev,
0
);
+ rules = udev_rules_new(udev,
1
);
- util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
- util_strlcat(syspath, devpath, sizeof(syspath));
+ util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), devpath, NULL);
dev = udev_device_new_from_syspath(udev, syspath);
if (dev == NULL) {
info(udev, "unknown device '%s'\n", devpath);
dev = udev_device_new_from_syspath(udev, syspath);
if (dev == NULL) {
info(udev, "unknown device '%s'\n", devpath);
@@
-111,7
+110,7
@@
int main(int argc, char *argv[])
fail:
udev_rules_unref(rules);
exit:
fail:
udev_rules_unref(rules);
exit:
- selinux_exit(udev);
+
udev_
selinux_exit(udev);
udev_unref(udev);
if (err != 0)
return 1;
udev_unref(udev);
if (err != 0)
return 1;