--- trunk/src/console.c	2007/10/08 16:17:48	2
+++ trunk/src/console.c	2007/10/08 16:18:27	10
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: console.c,v 1.6 2005/03/05 12:17:53 debug Exp $
+ *  $Id: console.c,v 1.9 2005/06/26 11:36:27 debug Exp $
  *
  *  Generic console support functions.
  *
@@ -42,7 +42,6 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
-#include <sys/time.h>
 #include <sys/types.h>
 
 #include "console.h"
@@ -181,13 +180,15 @@
 	a[0] = getenv("XTERM");
 	if (a[0] == NULL)
 		a[0] = "xterm";
-	a[1] = "-title";
-	a[2] = console_handles[handle].name;
-	a[3] = "-e";
-	a[4] = progname;
-	a[5] = malloc(50);
-	sprintf(a[5], "-WW@S%i,%i", filedes[0], filedesB[1]);
-	a[6] = NULL;
+	a[1] = "-geometry";
+	a[2] = "80x25";
+	a[3] = "-title";
+	a[4] = console_handles[handle].name;
+	a[5] = "-e";
+	a[6] = progname;
+	a[7] = malloc(80);
+	snprintf(a[7], 80, "-WW@S%i,%i", filedes[0], filedesB[1]);
+	a[8] = NULL;
 
 	p = fork();
 	if (p == -1) {
@@ -640,6 +641,7 @@
 int console_start_slave(struct machine *machine, char *consolename)
 {
 	int handle;
+	size_t mlen;
 	struct console_handle *chp;
 
 	if (machine == NULL || consolename == NULL) {
@@ -649,12 +651,14 @@
 
 	chp = console_new_handle(consolename, &handle);
 
-	chp->name = malloc(strlen(machine->name) + strlen(consolename) + 100);
+	mlen = strlen(machine->name) + strlen(consolename) + 40;
+	chp->name = malloc(mlen);
 	if (chp->name == NULL) {
 		printf("out of memory\n");
 		exit(1);
 	}
-	sprintf(chp->name, "GXemul: '%s' %s", machine->name, consolename);
+	snprintf(chp->name, mlen, "GXemul: '%s' %s",
+	    machine->name, consolename);
 
 #if 0
 	if (!machine->use_x11) {
@@ -683,6 +687,7 @@
 {
 	struct console_handle *chp;
 	int handle;
+	size_t mlen;
 
 	if (machine == NULL || consolename == NULL) {
 		printf("console_start_slave(): NULL ptr\n");
@@ -692,12 +697,14 @@
 	chp = console_new_handle(consolename, &handle);
 	chp->inputonly = 1;
 
-	chp->name = malloc(strlen(machine->name) + strlen(consolename) + 100);
+	mlen = strlen(machine->name) + strlen(consolename) + 40;
+	chp->name = malloc(mlen);
 	if (chp->name == NULL) {
 		printf("out of memory\n");
 		exit(1);
 	}
-	sprintf(chp->name, "GXemul: '%s' %s", machine->name, consolename);
+	snprintf(chp->name, mlen, "GXemul: '%s' %s",
+	    machine->name, consolename);
 
 	return handle;
 }