Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/get_console.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/get_console.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/libbb/get_console.c

@@ -6 +6 @@
  * acknowledge your work.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-//#include <sys/ioctl.h>
 #include "libbb.h"
-
 
 /* From <linux/kd.h> */
 enum { KDGKBTYPE = 0x4B33 };  /* get keyboard type */
-
 
 static int open_a_console(const char *fnam)
@@ -40 +37 @@
  * if someone else used X (which does a chown on /dev/console).
  */
-
-int get_console_fd(void)
+int FAST_FUNC get_console_fd_or_die(void)
 {
     static const char *const console_names[] = {
@@ -68 +64 @@
     }
 
-    bb_error_msg("cannot get file descriptor referring to console");
-    return fd;                      /* total failure */
+    bb_error_msg_and_die("can't open console");
+    /*return fd; - total failure */
 }
+
+/* From <linux/vt.h> */
+enum {
+    VT_ACTIVATE = 0x5606,   /* make vt active */
+    VT_WAITACTIVE = 0x5607  /* wait for vt active */
+};
+
+void FAST_FUNC console_make_active(int fd, const int vt_num)
+{
+    xioctl(fd, VT_ACTIVATE, (void *)(ptrdiff_t)vt_num);
+    xioctl(fd, VT_WAITACTIVE, (void *)(ptrdiff_t)vt_num);
+}