shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 18:27:04 +03:00
Code

logind: minor clean-ups

Browse Source
This commit is contained in:
Lennart Poettering 2015-10-21 19:36:22 +02:00
parent 5b7481633f
commit 16597ac390
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/login/logind-session.c
View File

@ -1049,9 +1049,13 @@ error:
}
void session_restore_vt(Session *s) {
static const struct vt_mode mode = {
.mode = VT_AUTO,
};
_cleanup_free_ char *utf8 = NULL;
int vt, kb = K_XLATE;
struct vt_mode mode = { 0 };
int vt, kb, old_fd;
/* We need to get a fresh handle to the virtual terminal,
* since the old file-descriptor is potentially in a hung-up
@ -1059,7 +1063,7 @@ void session_restore_vt(Session *s) {
* little dance to avoid having the terminal be available
* for reuse before we've cleaned it up.
*/
int old_fd = s->vtfd;
old_fd = s->vtfd;
s->vtfd = -1;
vt = session_open_vt(s);
@ -1072,13 +1076,13 @@ void session_restore_vt(Session *s) {
if (read_one_line_file("/sys/module/vt/parameters/default_utf8", &utf8) >= 0 && *utf8 == '1')
kb = K_UNICODE;
else
kb = K_XLATE;
(void) ioctl(vt, KDSKBMODE, kb);
mode.mode = VT_AUTO;
(void) ioctl(vt, VT_SETMODE, &mode);
fchown(vt, 0, -1);
(void) fchown(vt, 0, (gid_t) -1);
s->vtfd = safe_close(s->vtfd);
}