picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Move verify_vc_kbmode() to terminal-util.c as vt_verify_kbmode()" 

This reverts commit bb5ac84d79.
This commit is contained in:
Lennart Poettering 2019-07-18 16:01:07 +02:00
parent 15bba61325
commit 26382cab1b
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/basic/terminal-util.c
View File

@ -1260,23 +1260,6 @@ int vt_default_utf8(void) {
return parse_boolean(b);
}
int vt_verify_kbmode(int fd) {
int curr_mode;
/*
* Make sure we only adjust consoles in K_XLATE or K_UNICODE mode.
* Otherwise we would (likely) interfere with X11's processing of the
* key events.
*
* http://lists.freedesktop.org/archives/systemd-devel/2013-February/008573.html
*/
if (ioctl(fd, KDGKBMODE, &curr_mode) < 0)
return -errno;
return IN_SET(curr_mode, K_XLATE, K_UNICODE) ? 0 : -EBUSY;
}
int vt_reset_keyboard(int fd) {
int kb;

1
src/basic/terminal-util.h
View File

@ -158,7 +158,6 @@ int openpt_allocate_in_namespace(pid_t pid, int flags, char **ret_slave);
int open_terminal_in_namespace(pid_t pid, const char *name, int mode);
int vt_default_utf8(void);
int vt_verify_kbmode(int fd);
int vt_reset_keyboard(int fd);
int vt_restore(int fd);
int vt_release(int fd, bool restore_vt);

23
src/vconsole/vconsole-setup.c
View File

@ -70,6 +70,23 @@ static int verify_vc_allocation_byfd(int fd) {
return verify_vc_allocation(vcs.v_active);
}
static int verify_vc_kbmode(int fd) {
int curr_mode;
/*
* Make sure we only adjust consoles in K_XLATE or K_UNICODE mode.
* Otherwise we would (likely) interfere with X11's processing of the
* key events.
*
* http://lists.freedesktop.org/archives/systemd-devel/2013-February/008573.html
*/
if (ioctl(fd, KDGKBMODE, &curr_mode) < 0)
return -errno;
return IN_SET(curr_mode, K_XLATE, K_UNICODE) ? 0 : -EBUSY;
}
static int toggle_utf8(const char *name, int fd, bool utf8) {
int r;
struct termios tc = {};
@ -273,7 +290,7 @@ static void setup_remaining_vcs(int src_fd, unsigned src_idx, bool utf8) {
continue;
}
if (vt_verify_kbmode(fd_d) < 0)
if (verify_vc_kbmode(fd_d) < 0)
continue;
toggle_utf8(ttyname, fd_d, utf8);
@ -348,7 +365,7 @@ static int find_source_vc(char **ret_path, unsigned *ret_idx) {
err = -fd;
continue;
}
r = vt_verify_kbmode(fd);
r = verify_vc_kbmode(fd);
if (r < 0) {
if (!err)
err = -r;
@ -381,7 +398,7 @@ static int verify_source_vc(char **ret_path, const char *src_vc) {
if (r < 0)
return log_error_errno(r, "Virtual console %s is not allocated: %m", src_vc);
r = vt_verify_kbmode(fd);
r = verify_vc_kbmode(fd);
if (r < 0)
return log_error_errno(r, "Virtual console %s is not in K_XLATE or K_UNICODE: %m", src_vc);