diff -ru -Xfreeciv/diff_ignore freeciv/server/console.c conslinelen/server/console.c
--- freeciv/server/console.c	Thu Aug 17 05:20:24 2000
+++ conslinelen/server/console.c	Thu Jul 26 19:52:26 2001
@@ -86,7 +86,7 @@
 ************************************************************************/
 int con_dump(int i, char *message, ...)
 {
-  static char buf[512];
+  static char buf[MAX_LEN_CONSOLE_LINE];
   va_list args;
   
   va_start(args, message);
@@ -110,7 +110,7 @@
 ************************************************************************/
 void con_write(int i, char *message, ...)
 {
-  static char buf[512];
+  static char buf[MAX_LEN_CONSOLE_LINE];
   va_list args;
   
   va_start(args, message);
@@ -147,7 +147,7 @@
 ************************************************************************/
 void con_rfconly(int i, char *message, ...)
 {
-  static char buf[512];
+  static char buf[MAX_LEN_CONSOLE_LINE];
   va_list args;
   
   va_start(args, message);
diff -ru -Xfreeciv/diff_ignore freeciv/server/console.h conslinelen/server/console.h
--- freeciv/server/console.h	Mon Jul 17 16:45:43 2000
+++ conslinelen/server/console.h	Thu Jul 26 19:52:26 2001
@@ -15,6 +15,8 @@
 
 #include "attribute.h"
 
+#define MAX_LEN_CONSOLE_LINE 512
+				/* closing \0 included */
 #define C_IGNORE -1		/* never print RFC-style number prefix */
 #define C_COMMENT 0 		/* for human eyes only */
 #define C_VERSION 1		/* version info */
diff -ru -Xfreeciv/diff_ignore freeciv/server/stdinhand.c conslinelen/server/stdinhand.c
--- freeciv/server/stdinhand.c	Thu Jul 26 18:02:00 2001
+++ conslinelen/server/stdinhand.c	Thu Jul 26 19:32:29 2001
@@ -55,9 +55,6 @@
 #include "stdinhand.h"
 
 
-#define MAX_LEN_CMD MAX_LEN_PACKET
-  /* to be used more widely - rp */
-
 static enum cmdlevel_id default_access_level = ALLOW_INFO;
 static enum cmdlevel_id   first_access_level = ALLOW_INFO;
 
@@ -1706,14 +1703,14 @@
 void read_init_script(char *script_filename)
 {
   FILE *script_file;
-  char buffer[512];
+  char buffer[MAX_LEN_CONSOLE_LINE];
 
   script_file = fopen(script_filename,"r");
 
   if (script_file) {
 
-    /* the size 511 is set as to not overflow buffer in handle_stdin_input */
-    while(fgets(buffer,511,script_file))
+    /* the size is set as to not overflow buffer in handle_stdin_input */
+    while(fgets(buffer,MAX_LEN_CONSOLE_LINE-1,script_file))
       handle_stdin_input((struct connection *)NULL, buffer);
     fclose(script_file);
 
@@ -1959,8 +1956,8 @@
 **************************************************************************/
 static void cmdlevel_command(struct connection *caller, char *str)
 {
-  char arg_level[MAX_LEN_CMD+1]; /* info, ctrl etc */
-  char arg_name[MAX_LEN_CMD+1];	 /* a player name, or "new" */
+  char arg_level[MAX_LEN_CONSOLE_LINE]; /* info, ctrl etc */
+  char arg_name[MAX_LEN_CONSOLE_LINE];	 /* a player name, or "new" */
   char *cptr_s, *cptr_d;	 /* used for string ops */
 
   enum m_pre_result match_result;
@@ -2210,7 +2207,7 @@
       cmd_reply(help_cmd, caller, C_COMMENT, "%s", settings[i].name);
     }
   } else {
-    char buf[MAX_LEN_CMD+1];
+    char buf[MAX_LEN_CONSOLE_LINE];
     buf[0] = '\0';
     for (i=0, j=0; settings[i].name; i++) {
       if (may_view_option(caller, i)) {
@@ -2232,7 +2229,7 @@
 **************************************************************************/
 static void explain_option(struct connection *caller, char *str)
 {
-  char command[MAX_LEN_CMD+1], *cptr_s, *cptr_d;
+  char command[MAX_LEN_CONSOLE_LINE], *cptr_s, *cptr_d;
   int cmd;
 
   for(cptr_s=str; *cptr_s && !isalnum(*cptr_s); cptr_s++);
@@ -2374,8 +2371,8 @@
 ******************************************************************/
 static void show_command(struct connection *caller, char *str)
 {
-  char buf[MAX_LEN_CMD+1];
-  char command[MAX_LEN_CMD+1], *cptr_s, *cptr_d;
+  char buf[MAX_LEN_CONSOLE_LINE];
+  char command[MAX_LEN_CONSOLE_LINE], *cptr_s, *cptr_d;
   int cmd,i,len1;
   int clen = 0;
 
@@ -2492,7 +2489,7 @@
 ******************************************************************/
 static void set_command(struct connection *caller, char *str) 
 {
-  char command[MAX_LEN_CMD+1], arg[MAX_LEN_CMD+1], *cptr_s, *cptr_d;
+  char command[MAX_LEN_CONSOLE_LINE], arg[MAX_LEN_CONSOLE_LINE], *cptr_s, *cptr_d;
   int val, cmd;
   struct settings_s *op;
 
@@ -2538,9 +2535,8 @@
   if (SETTING_IS_INT(op)) {
     val = atoi(arg);
     if (!val && arg[0] != '0') {
-      /* arg doesn't seem to be a number at all */
       cmd_reply(CMD_SET, caller, C_SYNTAX,
-		_("Value must be an integer"));
+		_("Value must be an integer."));
     } else if (val >= op->min_value && val <= op->max_value) {
       char *reject_message = NULL;
       if (!settings[cmd].func_change || settings[cmd].func_change(val, &reject_message)) {
@@ -2599,7 +2595,7 @@
 **************************************************************************/
 void handle_stdin_input(struct connection *caller, char *str)
 {
-  char command[MAX_LEN_CMD+1], arg[MAX_LEN_CMD+1], *cptr_s, *cptr_d;
+  char command[MAX_LEN_CONSOLE_LINE], arg[MAX_LEN_CONSOLE_LINE], *cptr_s, *cptr_d;
   int i;
   enum command_id cmd;
 
@@ -2938,7 +2934,7 @@
       cmd_reply(help_cmd, caller, C_COMMENT, "%s", commands[i].name);
     }
   } else {
-    char buf[MAX_LEN_CMD+1];
+    char buf[MAX_LEN_CONSOLE_LINE];
     int j;
     
     buf[0] = '\0';
@@ -3098,7 +3094,7 @@
 **************************************************************************/
 void show_players(struct connection *caller)
 {
-  char buf[512], buf2[512];
+  char buf[MAX_LEN_CONSOLE_LINE], buf2[MAX_LEN_CONSOLE_LINE];
   int i, n;
   
   cmd_reply(CMD_LIST, caller, C_COMMENT, _("List of players:"));
@@ -3180,7 +3176,7 @@
 **************************************************************************/
 static void show_connections(struct connection *caller)
 {
-  char buf[512];
+  char buf[MAX_LEN_CONSOLE_LINE];
   
   cmd_reply(CMD_LIST, caller, C_COMMENT, _("List of connections to server:"));
   cmd_reply(CMD_LIST, caller, C_COMMENT, horiz_line);