chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add short-iso-precise for journalctl output (#5884)
[elogind.git]
/
src
/
login
/
logind-button.c
diff --git
a/src/login/logind-button.c
b/src/login/logind-button.c
index 57e619efe690b801e80fa65cb5115afcb58a48ae..d739af8ea2c3f7c023a9455bbca318b9afa99384 100644
(file)
--- a/
src/login/logind-button.c
+++ b/
src/login/logind-button.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-19,19
+17,20
@@
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 <string.h>
#include <errno.h>
#include <fcntl.h>
#include <errno.h>
#include <fcntl.h>
+#include <string.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <linux/input.h>
#include "sd-messages.h"
#include <sys/ioctl.h>
#include <unistd.h>
#include <linux/input.h>
#include "sd-messages.h"
-#include "conf-parser.h"
-#include "util.h"
-#include "
specia
l.h"
+
+#include "
alloc-
util.h"
+#include "
fd-uti
l.h"
#include "logind-button.h"
#include "logind-button.h"
+#include "string-util.h"
+#include "util.h"
Button* button_new(Manager *m, const char *name) {
Button *b;
Button* button_new(Manager *m, const char *name) {
Button *b;
@@
-44,15
+43,12
@@
Button* button_new(Manager *m, const char *name) {
return NULL;
b->name = strdup(name);
return NULL;
b->name = strdup(name);
- if (!b->name) {
- free(b);
- return NULL;
- }
+ if (!b->name)
+ return mfree(b);
if (hashmap_put(m->buttons, b->name, b) < 0) {
free(b->name);
if (hashmap_put(m->buttons, b->name, b) < 0) {
free(b->name);
- free(b);
- return NULL;
+ return mfree(b);
}
b->manager = m;
}
b->manager = m;
@@
-69,12
+65,11
@@
void button_free(Button *b) {
sd_event_source_unref(b->io_event_source);
sd_event_source_unref(b->check_event_source);
sd_event_source_unref(b->io_event_source);
sd_event_source_unref(b->check_event_source);
- if (b->fd >= 0)
{
+ if (b->fd >= 0)
/* If the device has been unplugged close() returns
* ENODEV, let's ignore this, hence we don't use
* safe_close() */
/* If the device has been unplugged close() returns
* ENODEV, let's ignore this, hence we don't use
* safe_close() */
- close(b->fd);
- }
+ (void) close(b->fd);
free(b->name);
free(b->seat);
free(b->name);
free(b->seat);
@@
-103,7
+98,7
@@
static void button_lid_switch_handle_action(Manager *manager, bool is_edge) {
assert(manager);
/* If we are docked, handle the lid switch differently */
assert(manager);
/* If we are docked, handle the lid switch differently */
- if (manager_is_docked_or_
multiple
_displays(manager))
+ if (manager_is_docked_or_
external
_displays(manager))
handle_action = manager->handle_lid_switch_docked;
else
handle_action = manager->handle_lid_switch;
handle_action = manager->handle_lid_switch_docked;
else
handle_action = manager->handle_lid_switch;
@@
-159,8
+154,8
@@
static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
case KEY_POWER:
case KEY_POWER2:
log_struct(LOG_INFO,
case KEY_POWER:
case KEY_POWER2:
log_struct(LOG_INFO,
-
"MESSAGE=Power key pressed."
,
-
MESSAGE_ID(SD_MESSAGE_POWER_KEY)
,
+
LOG_MESSAGE("Power key pressed.")
,
+
"MESSAGE_ID=" SD_MESSAGE_POWER_KEY_STR
,
NULL);
manager_handle_action(b->manager, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true);
NULL);
manager_handle_action(b->manager, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true);
@@
-174,8
+169,8
@@
static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
case KEY_SLEEP:
log_struct(LOG_INFO,
case KEY_SLEEP:
log_struct(LOG_INFO,
-
"MESSAGE=Suspend key pressed."
,
-
MESSAGE_ID(SD_MESSAGE_SUSPEND_KEY)
,
+
LOG_MESSAGE("Suspend key pressed.")
,
+
"MESSAGE_ID=" SD_MESSAGE_SUSPEND_KEY_STR
,
NULL);
manager_handle_action(b->manager, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true);
NULL);
manager_handle_action(b->manager, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true);
@@
-183,8
+178,8
@@
static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
case KEY_SUSPEND:
log_struct(LOG_INFO,
case KEY_SUSPEND:
log_struct(LOG_INFO,
-
"MESSAGE=Hibernate key pressed."
,
-
MESSAGE_ID(SD_MESSAGE_HIBERNATE_KEY)
,
+
LOG_MESSAGE("Hibernate key pressed.")
,
+
"MESSAGE_ID=" SD_MESSAGE_HIBERNATE_KEY_STR
,
NULL);
manager_handle_action(b->manager, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true);
NULL);
manager_handle_action(b->manager, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true);
@@
-195,8
+190,8
@@
static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
if (ev.code == SW_LID) {
log_struct(LOG_INFO,
if (ev.code == SW_LID) {
log_struct(LOG_INFO,
-
"MESSAGE=Lid closed."
,
-
MESSAGE_ID(SD_MESSAGE_LID_CLOSED)
,
+
LOG_MESSAGE("Lid closed.")
,
+
"MESSAGE_ID=" SD_MESSAGE_LID_CLOSED_STR
,
NULL);
b->lid_closed = true;
NULL);
b->lid_closed = true;
@@
-205,8
+200,8
@@
static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
} else if (ev.code == SW_DOCK) {
log_struct(LOG_INFO,
} else if (ev.code == SW_DOCK) {
log_struct(LOG_INFO,
-
"MESSAGE=System docked."
,
-
MESSAGE_ID(SD_MESSAGE_SYSTEM_DOCKED)
,
+
LOG_MESSAGE("System docked.")
,
+
"MESSAGE_ID=" SD_MESSAGE_SYSTEM_DOCKED_STR
,
NULL);
b->docked = true;
NULL);
b->docked = true;
@@
-216,8
+211,8
@@
static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
if (ev.code == SW_LID) {
log_struct(LOG_INFO,
if (ev.code == SW_LID) {
log_struct(LOG_INFO,
-
"MESSAGE=Lid opened."
,
-
MESSAGE_ID(SD_MESSAGE_LID_OPENED)
,
+
LOG_MESSAGE("Lid opened.")
,
+
"MESSAGE_ID=" SD_MESSAGE_LID_OPENED_STR
,
NULL);
b->lid_closed = false;
NULL);
b->lid_closed = false;
@@
-225,8
+220,8
@@
static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
} else if (ev.code == SW_DOCK) {
log_struct(LOG_INFO,
} else if (ev.code == SW_DOCK) {
log_struct(LOG_INFO,
-
"MESSAGE=System undocked."
,
-
MESSAGE_ID(SD_MESSAGE_SYSTEM_UNDOCKED)
,
+
LOG_MESSAGE("System undocked.")
,
+
"MESSAGE_ID=" SD_MESSAGE_SYSTEM_UNDOCKED_STR
,
NULL);
b->docked = false;
NULL);
b->docked = false;
@@
-242,28
+237,22
@@
int button_open(Button *b) {
assert(b);
assert(b);
- if (b->fd >= 0) {
- close(b->fd);
- b->fd = -1;
- }
+ b->fd = safe_close(b->fd);
- p = str
append
a("/dev/input/", b->name);
+ p = str
join
a("/dev/input/", b->name);
b->fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK);
b->fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK);
- if (b->fd < 0) {
- log_warning("Failed to open %s: %m", b->name);
- return -errno;
- }
+ if (b->fd < 0)
+ return log_warning_errno(errno, "Failed to open %s: %m", b->name);
if (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) {
if (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) {
- log_error("Failed to get input name: %m");
- r = -errno;
+ r = log_error_errno(errno, "Failed to get input name: %m");
goto fail;
}
r = sd_event_add_io(b->manager->event, &b->io_event_source, b->fd, EPOLLIN, button_dispatch, b);
if (r < 0) {
goto fail;
}
r = sd_event_add_io(b->manager->event, &b->io_event_source, b->fd, EPOLLIN, button_dispatch, b);
if (r < 0) {
- log_error
("Failed to add button event: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to add button event: %m"
);
goto fail;
}
goto fail;
}
@@
-272,8
+261,7
@@
int button_open(Button *b) {
return 0;
fail:
return 0;
fail:
- close(b->fd);
- b->fd = -1;
+ b->fd = safe_close(b->fd);
return r;
}
return r;
}