Attachment 248391 Details for Bug 366981 – patch to use VT_ETSTATE and tty0

[patch] patch to use VT_ETSTATE and tty0

ConsoleKit-0.2.3-vtgetstate.patch (text/plain), 1.32 KB, created by Peter Jones on 2007-11-05 16:13:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Jones

Created: 2007-11-05 16:13:35 UTC

Size: 1.32 KB

patch

obsolete

>diff -urpN ConsoleKit-0.2.3/src/ck-sysdeps-unix.c.badaddr ConsoleKit-0.2.3/src/ck-sysdeps-unix.c
>--- ConsoleKit-0.2.3/src/ck-sysdeps-unix.c.badaddr	2007-08-28 13:19:17.000000000 -0400
>+++ ConsoleKit-0.2.3/src/ck-sysdeps-unix.c	2007-10-30 18:40:55.000000000 -0400
>@@ -124,15 +124,15 @@ gboolean
> ck_fd_is_a_console (int fd)
> {
> #ifdef __linux__
>-        char arg = 0;
>+	struct vt_stat vts;
> #elif defined(__FreeBSD__)
>         int vers;
> #endif
>         int  kb_ok;
> 
>+	errno = 0;
> #ifdef __linux__
>-        kb_ok = (ioctl (fd, KDGKBTYPE, &arg) == 0
>-                 && ((arg == KB_101) || (arg == KB_84)));
>+        kb_ok = (ioctl (fd, VT_GETSTATE, &vts) == 0);
> #elif defined(__FreeBSD__)
>         kb_ok = (ioctl (fd, CONS_GETVERS, &vers) == 0);
> #else
>@@ -193,6 +193,11 @@ ck_get_a_console_fd (void)
>                 goto done;
>         }
> 
>+	fd = open_a_console("/dev/tty0");
>+	if (fd >= 0) {
>+		goto done;
>+	}
>+
> #ifdef _PATH_CONSOLE
>         fd = open_a_console (_PATH_CONSOLE);
>         if (fd >= 0) {
>@@ -256,7 +261,7 @@ ck_wait_for_active_console_num (int   co
>         errno = 0;
>         res = ioctl (console_fd, VT_WAITACTIVE, num);
> 
>-        g_debug ("VT_WAITACTIVE for vt %d returned %d", num, ret);
>+        g_debug ("VT_WAITACTIVE for vt %d returned %d (%m)", num, res);
> 
>         if (res == ERROR) {
>                 const char *errmsg;

Actions: View | Diff

Attachments on bug 366981: 248391