chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: apply selinux label to XDG_RUNTIME_DIR
[elogind.git]
/
src
/
login
/
logind-session-device.c
diff --git
a/src/login/logind-session-device.c
b/src/login/logind-session-device.c
index b2ef8ccc999e6f01925697af22b563878ee76c0b..656f268dba4eae34440005ec6a870359e7fb2608 100644
(file)
--- a/
src/login/logind-session-device.c
+++ b/
src/login/logind-session-device.c
@@
-19,16
+19,12
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <fcntl.h>
#include <libudev.h>
#include <linux/input.h>
#include <fcntl.h>
#include <libudev.h>
#include <linux/input.h>
-#include <linux/ioctl.h>
#include <string.h>
#include <sys/ioctl.h>
#include <string.h>
#include <sys/ioctl.h>
-#include <sys/stat.h>
#include <sys/types.h>
#include <sys/types.h>
-#include <unistd.h>
#include "util.h"
#include "missing.h"
#include "util.h"
#include "missing.h"
@@
-62,10
+58,10
@@
static int session_device_notify(SessionDevice *sd, enum SessionDeviceNotificati
return -ENOMEM;
r = sd_bus_message_new_signal(
return -ENOMEM;
r = sd_bus_message_new_signal(
- sd->session->manager->bus, path,
+ sd->session->manager->bus,
+ &m, path,
"org.freedesktop.login1.Session",
"org.freedesktop.login1.Session",
- (type == SESSION_DEVICE_RESUME) ? "ResumeDevice" : "PauseDevice",
- &m);
+ (type == SESSION_DEVICE_RESUME) ? "ResumeDevice" : "PauseDevice");
if (!m)
return r;
if (!m)
return r;
@@
-107,7
+103,7
@@
static int sd_eviocrevoke(int fd) {
assert(fd >= 0);
assert(fd >= 0);
- r = ioctl(fd, EVIOCREVOKE,
1
);
+ r = ioctl(fd, EVIOCREVOKE,
NULL
);
if (r < 0) {
r = -errno;
if (r == -EINVAL && !warned) {
if (r < 0) {
r = -errno;
if (r == -EINVAL && !warned) {
@@
-162,7
+158,7
@@
static int session_device_open(SessionDevice *sd, bool active) {
* state. */
r = sd_drmsetmaster(fd);
if (r < 0) {
* state. */
r = sd_drmsetmaster(fd);
if (r < 0) {
- close(fd);
+ close
_nointr
(fd);
return r;
}
} else {
return r;
}
} else {
@@
-209,7
+205,7
@@
static int session_device_start(SessionDevice *sd) {
r = session_device_open(sd, true);
if (r < 0)
return r;
r = session_device_open(sd, true);
if (r < 0)
return r;
- close_nointr
_nofail
(sd->fd);
+ close_nointr(sd->fd);
sd->fd = r;
break;
case DEVICE_TYPE_UNKNOWN:
sd->fd = r;
break;
case DEVICE_TYPE_UNKNOWN:
@@
-407,7
+403,7
@@
void session_device_free(SessionDevice *sd) {
session_device_stop(sd);
session_device_notify(sd, SESSION_DEVICE_RELEASE);
session_device_stop(sd);
session_device_notify(sd, SESSION_DEVICE_RELEASE);
- close_nointr
_nofail
(sd->fd);
+ close_nointr(sd->fd);
LIST_REMOVE(sd_by_device, sd->device->session_devices, sd);
LIST_REMOVE(sd_by_device, sd->device->session_devices, sd);