move console_activate_current

3 files changed, 25 insertions, 23 deletions

diff --git a/fbtools.c b/fbtools.c
index c7d1cf1..06fb31f 100644
--- a/fbtools.c
+++ b/fbtools.c
@@ -203,26 +203,6 @@ fb_setmode(char *name)
     return -1;
 }
 
-/* Hmm. radeonfb needs this. matroxfb doesn't. */
-static int fb_activate_current(int tty)
-{
-    struct vt_stat vts;
-    
-    if (-1 == ioctl(tty,VT_GETSTATE, &vts)) {
-	perror("ioctl VT_GETSTATE");
-	return -1;
-    }
-    if (-1 == ioctl(tty,VT_ACTIVATE, vts.v_active)) {
-	perror("ioctl VT_ACTIVATE");
-	return -1;
-    }
-    if (-1 == ioctl(tty,VT_WAITACTIVE, vts.v_active)) {
-	perror("ioctl VT_WAITACTIVE");
-	return -1;
-    }
-    return 0;
-}
-
 static void fb_restore_display(void)
 {
     ioctl(fb,FBIOPAN_DISPLAY,&fb_var);
@@ -356,7 +336,7 @@ gfxstate* fb_init(char *device, char *mode, int vt)
 	perror("ioctl KDSETMODE");
 	goto err;
     }
-    fb_activate_current(tty);
+    console_activate_current(tty);
 
     /* cls */
     fb_memset(fb_mem+fb_mem_offset, 0, fb_fix.line_length * fb_var.yres);
diff --git a/vt.c b/vt.c
index 75559fb..746bdc7 100644
--- a/vt.c
+++ b/vt.c
@@ -120,7 +120,7 @@ void console_set_vt(int vtno)
     char vtname[12];
 
     if (vtno < 0) {
-	if (-1 == ioctl(tty,VT_OPENQRY, &vtno) || vtno == -1) {
+	if (-1 == ioctl(tty, VT_OPENQRY, &vtno) || vtno == -1) {
 	    perror("ioctl VT_OPENQRY");
 	    exit(1);
 	}
@@ -133,6 +133,8 @@ void console_set_vt(int vtno)
 	fprintf(stderr,"access %s: %s\n",vtname,strerror(errno));
 	exit(1);
     }
+
+    /* switch controlling tty */
     switch (fork()) {
     case 0:
 	break;
@@ -142,7 +144,6 @@ void console_set_vt(int vtno)
     default:
 	exit(0);
     }
-    close(tty);
     close(0);
     close(1);
     close(2);
@@ -176,3 +177,23 @@ void console_restore_vt(void)
     if (ioctl(tty, VT_WAITACTIVE, orig_vt_no) < 0)
 	perror("ioctl VT_WAITACTIVE");
 }
+
+/* Hmm. radeonfb needs this. matroxfb doesn't. */
+int console_activate_current(int tty)
+{
+    struct vt_stat vts;
+
+    if (-1 == ioctl(tty,VT_GETSTATE, &vts)) {
+	perror("ioctl VT_GETSTATE");
+	return -1;
+    }
+    if (-1 == ioctl(tty,VT_ACTIVATE, vts.v_active)) {
+	perror("ioctl VT_ACTIVATE");
+	return -1;
+    }
+    if (-1 == ioctl(tty,VT_WAITACTIVE, vts.v_active)) {
+	perror("ioctl VT_WAITACTIVE");
+	return -1;
+    }
+    return 0;
+}
diff --git a/vt.h b/vt.h
index bbba2be..931df4d 100644
--- a/vt.h
+++ b/vt.h
@@ -5,3 +5,4 @@ int check_console_switch(void);
 
 void console_set_vt(int vtno);
 void console_restore_vt(void);
+int console_activate_current(int tty);