diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/server/barbarian.c codeciv/server/barbarian.c
--- freeciv/server/barbarian.c	Thu Dec  6 17:42:50 2001
+++ codeciv/server/barbarian.c	Thu Dec  6 20:28:55 2001
@@ -104,7 +104,7 @@
 
   if( newplayer >= MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS ) {
     freelog( LOG_FATAL, "Too many players?");
-    exit(1);
+    abort();
   }
 
   barbarians = &game.players[newplayer];
diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/server/sernet.c codeciv/server/sernet.c
--- freeciv/server/sernet.c	Thu Dec  6 17:42:54 2001
+++ codeciv/server/sernet.c	Thu Dec  6 20:29:02 2001
@@ -137,6 +137,8 @@
 
 static int readline_handled_input = 0;
 
+static int readline_initialized = 0;
+
 /*****************************************************************************
 ...
 *****************************************************************************/
@@ -187,7 +189,13 @@
 void close_connections_and_socket(void)
 {
   int i;
-  
+
+  struct packet_generic_message gen_packet;
+  gen_packet.message[0]='\0';
+
+  lsend_packet_generic_message(&game.all_connections, PACKET_SERVER_SHUTDOWN,
+			       &gen_packet);
+
   for(i=0; i<MAX_NUM_CONNECTIONS; i++) {
     if(connections[i].used) {
       close_connection(&connections[i]);
@@ -200,7 +208,14 @@
     write_history(history_file);
     history_truncate_file(history_file, HISTORY_LENGTH);
   }
+  if (readline_initialized) {
+    rl_callback_handler_remove();
+  }
 #endif
+
+  server_close_udp();
+
+  my_shutdown_network();
 }
 
 /*****************************************************************************
@@ -310,8 +325,6 @@
 
 #ifdef HAVE_LIBREADLINE
   {
-    static int readline_initialized = 0;
-
     if (!no_input && !readline_initialized) {
       char *home_dir = user_home_dir();
       if (home_dir) {
@@ -362,7 +375,8 @@
 	    freelog(LOG_NORMAL, srvarg.metaserver_info_line);
 	    send_server_info_to_metaserver(1,0);
 
-	    quit_game(NULL);
+	    close_connections_and_socket();
+	    exit(0);
 	  }
 	} else {
 	  last_noplayers = time(NULL);
diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/server/srv_main.c codeciv/server/srv_main.c
--- freeciv/server/srv_main.c	Thu Dec  6 17:42:58 2001
+++ codeciv/server/srv_main.c	Thu Dec  6 20:29:06 2001
@@ -1980,9 +1980,5 @@
     sniff_packets();
   }
 
-  server_close_udp();
-
-  my_shutdown_network();
-
-  return;
+  close_connections_and_socket();
 }
diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/server/stdinhand.c codeciv/server/stdinhand.c
--- freeciv/server/stdinhand.c	Thu Dec  6 17:43:02 2001
+++ codeciv/server/stdinhand.c	Thu Dec  6 20:29:10 2001
@@ -2994,12 +2994,7 @@
 **************************************************************************/
 void quit_game(struct connection *caller)
 {
-  struct packet_generic_message gen_packet;
-  gen_packet.message[0]='\0';
-  
   cmd_reply(CMD_QUIT, caller, C_OK, _("Goodbye."));
-  lsend_packet_generic_message(&game.all_connections, PACKET_SERVER_SHUTDOWN,
-			       &gen_packet);
   close_connections_and_socket();
   exit(0);
 }