--- freeciv-1.7.2.stock/server/stdinhand.c	Tue Dec 22 09:16:59 1998
+++ freeciv-1.7.2/server/stdinhand.c	Tue Feb  9 18:28:36 1999
@@ -31,7 +31,6 @@
 extern char metaserver_info_line[256];
 
 void cut_player_connection(char *playername);
-void quit_game(void);
 void show_help(void);
 void show_players(void);
 
@@ -236,6 +239,9 @@
 {
   static int first=1;
 
+  if(is_daemon)
+    return;
+
   if (first)
     printf("\nGet a list of the available commands with 'h'.\n");
 
@@ -620,6 +626,9 @@
   char command[512], arg[512], *cptr_s, *cptr_d;
   int i;
 
+  if(is_daemon)
+    return;
+
   /* Is it a comment or a blank line? */
   /* line is comment if the first non-whitespace character is '#': */
   for(cptr_s=str; *cptr_s && isspace(*cptr_s); cptr_s++);
@@ -666,8 +675,10 @@
     set_ai_level(arg, 5);
   else if (!strcmp("hard", command))
     set_ai_level(arg, 7);
-  else if(!strcmp("q", command))
-    quit_game();
+  else if(!strcmp("q", command)) {
+      quit_game();
+      exit(1);
+  }
   else if(!strcmp("c", command))
     cut_player_connection(arg);
   else if (!strcmp("show",command)) 
@@ -676,6 +687,12 @@
     explain_option(arg);
   else if (!strcmp("set", command)) 
     set_command(arg);
+  else if(!strcmp("daemon", command)) {
+    if(server_state==RUN_GAME_STATE)
+      become_daemon(arg);
+    else
+      printf("Sorry, you have to at least start the game before the process can become a daemon.\n");
+  }
   else if(!strcmp("score", command)) {
     if(server_state==RUN_GAME_STATE)
       show_ending();
@@ -727,47 +744,31 @@
 /**************************************************************************
 ...
 **************************************************************************/
-void quit_game(void)
-{
-  int i;
-  struct packet_generic_message gen_packet;
-  gen_packet.message[0]='\0';
-  
-  for(i=0; i<game.nplayers; i++)
-    send_packet_generic_message(game.players[i].conn, PACKET_SERVER_SHUTDOWN,
-				&gen_packet);
-  close_connections_and_socket();
-  
-  exit(1);
-}
-
-/**************************************************************************
-...
-**************************************************************************/
 void show_help(void)
 {
   puts("Available commands: (P=player, M=message, F=file, T=topic)");
   puts(horiz_line);
-  puts("h         - this help");
-  puts("explain   - help on server options");
-  puts("explain T - help on a particular server option");
-  puts("l         - list players");
-  puts("q         - quit game and shutdown server");
-  puts("c P       - cut connection to player");
-  puts("remove P  - fully remove player from game");
-  puts("score     - show current score");
-  puts("save F    - save game as file F");
-  puts("show      - list server options");
-  puts("meta M    - Set meta-server infoline to M");
-  puts("ai P      - toggles AI on player");
-  puts("create P  - creates an AI player");
-  puts("easy P    - AI player will be easy");
-  puts("easy      - All AI players will be easy");
-  puts("normal P  - AI player will be normal");
-  puts("normal    - All AI players will be normal");
-  puts("hard P    - AI player will be hard");
-  puts("hard      - All AI players will be hard");
-  puts("set       - set options");
+  puts("h          - this help");
+  puts("daemon [F] - become a daemon, use the file (if given) as a logfile");
+  puts("explain    - help on server options");
+  puts("explain T  - help on a particular server option");
+  puts("l          - list players");
+  puts("q          - quit game and shutdown server");
+  puts("c P        - cut connection to player");
+  puts("remove P   - fully remove player from game");
+  puts("score      - show current score");
+  puts("save F     - save game as file F");
+  puts("show       - list server options");
+  puts("meta M     - Set meta-server infoline to M");
+  puts("ai P       - toggles AI on player");
+  puts("create P   - creates an AI player");
+  puts("easy P     - AI player will be easy");
+  puts("easy       - All AI players will be easy");
+  puts("normal P   - AI player will be normal");
+  puts("normal     - All AI players will be normal");
+  puts("hard P     - AI player will be hard");
+  puts("hard       - All AI players will be hard");
+  puts("set        - set options");
   if(server_state==PRE_GAME_STATE) {
     puts("s         - start game");
   }
--- freeciv-1.7.2.stock/server/civserver.h	Mon Dec 21 11:14:37 1998
+++ freeciv-1.7.2/server/civserver.h	Tue Feb  9 18:28:36 1999
@@ -40,8 +40,11 @@
 void pick_ai_player_name(enum race_type race, char *newname);
 int mark_race_as_used(int race);
 void announce_ai_player(struct player *pplayer);
+void become_daemon(char *logfile);
+void quit_game(void);
 
 extern enum server_states server_state;
 extern int nocity_send;
+extern int is_daemon;
 
 #endif
--- freeciv-1.7.2.stock/server/civserver.c	Mon Dec 21 11:14:37 1998
+++ freeciv-1.7.2/server/civserver.c	Tue Feb  9 19:43:17 1999
@@ -19,7 +19,11 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <signal.h>
 
 #ifdef __EMX__
 #include <netdb.h>
@@ -72,6 +76,7 @@
 void ai_start_turn(void);
 int is_game_over();
 void read_init_script(char *script_filename);
+void deadly_signal(int sig);
 
 extern struct connection connections[];
 
@@ -109,18 +114,22 @@
 
 int rand_init=0;
 
+int is_daemon=0;
+
 /**************************************************************************
 ...
 **************************************************************************/
 int main(int argc, char *argv[])
 {
-  int h=0, v=0, n=0;
+  int h=0, v=0, n=0, do_daemon=0;
   char *log_filename=NULL;
   char *load_filename=NULL;
   char *script_filename=NULL;
   int i;
   int save_counter=0;
   int log_level=LOG_NORMAL;
+  struct packet_generic_message gen_packet;
+  struct sigaction act;
 
   strcpy(metaserver_info_line, DEFAULT_META_SERVER_INFO_STRING);
 
@@ -192,6 +201,17 @@
     else if(!strcmp("-v", argv[i]) || !strcmp("--version", argv[i])) { 
       v=1;
     }
+    else if(!strcmp("-b", argv[i]) || !strcmp("--background", argv[i])) {
+      if(++i>=argc) {
+	fprintf(stderr, "Error: no game file specified for daemon mode\n");
+	h=1;
+	break;
+      }
+      load_filename=argv[i];
+      do_daemon=1;
+      if(++i<argc)
+	log_filename=argv[i];
+    }
     else {
       fprintf(stderr, "Error: unknown option '%s'\n", argv[i]);
       h=1;
@@ -210,6 +230,7 @@
     fprintf(stderr, "  -r, --read\t\t\tRead startup script\n");
     fprintf(stderr, "  -s, --server H\t\tList this server as host H\n");
     fprintf(stderr, "  -d, --debug N\t\t\tSet debug log level (0,1,2)\n");
+    fprintf(stderr, "  -b, --background game logfile\t\t\tRestore game in daemon mode");
     fprintf(stderr, "  -v, --version\t\t\tPrint the version number\n");
     exit(0);
   }
@@ -219,6 +240,9 @@
     exit(0);
   }
 
+  if(do_daemon)
+    become_daemon(log_filename);
+
   log_init(log_filename);
   log_set_level(log_level);
   
@@ -285,6 +309,12 @@
 
   show_prompt();
 
+  if(is_daemon)
+    start_game();
+  /* Since there's no way to control the server we have to at least get the
+   * game started.
+   */
+
   while(server_state==PRE_GAME_STATE)
     sniff_packets();
 
@@ -381,20 +411,37 @@
 
   if(is_new_game) 
     init_new_game();
-    
+
   send_game_state(0, CLIENT_GAME_RUNNING_STATE);
-  
+
   /* from here on, treat scenarios as normal games, as this is what
      they have become (nothing special about them anymore)*/
   game.scenario=0;
+
+  /* Set up signal handlers */
+
+  act.sa_handler=&deadly_signal;
+  sigemptyset(&act.sa_mask);
+  sigaddset(&act.sa_mask,SIGTERM);
+  sigaddset(&act.sa_mask,SIGQUIT);
+  sigaddset(&act.sa_mask,SIGINT);
+  sigaddset(&act.sa_mask,SIGABRT);
+  sigaction(SIGTERM, &act, 0);
+  sigaction(SIGQUIT, &act, 0);
+  sigaction(SIGINT, &act, 0);
+  sigaction(SIGABRT, &act, 0);
   
   while(server_state==RUN_GAME_STATE) {
+    time_t now=time(0);
+
     force_end_of_sniff=0;
 /* printf("Shuffleplayers\n"); */
     shuffle_players();
 /* printf("Aistartturn\n"); */
     ai_start_turn();
-    printf("\n");		/* in case no output since last show_prompt() */
+
+    if(!is_daemon)
+      printf("\n");		/* in case no output since last show_prompt() */
     show_prompt();
 
 /* printf("sniffingpackets\n"); */
@@ -733,6 +785,87 @@
   force_end_of_sniff=1;
 }
 
+/**************************************************************************
+...
+**************************************************************************/
+void quit_game(void)
+ /* Saves the current game state before shutting down.  
+  * The filename is unique per port, so no worries about multiple servers.
+  */
+{
+  int i;
+
+  struct packet_generic_message gen_packet;
+  gen_packet.message[0]='\0';
+
+  for(i=0; i<game.nplayers; i++)
+    send_packet_generic_message(game.players[i].conn, PACKET_SERVER_SHUTDOWN,
+				&gen_packet);
+  close_connections_and_socket();
+
+}
+
+/**************************************************************************
+...
+***************************************************************************/
+
+void deadly_signal(int sig)
+
+{
+  fprintf(stderr,"Caught deadly signal %s, shutting down cleanly.\n",sys_siglist[sig]);
+  quit_game();
+  exit(1); /* FIXME: call the old handler? */
+}
+
+/**************************************************************************
+...
+***************************************************************************/
+
+void become_daemon(char *logfile)
+     /* Fork to the background, print PID for later reference */
+     /* FIXME: allow commands to be read from a FIFO for control of server? */
+
+{
+  pid_t child;
+  int newout_fd=-1,devnull_fd=-1;
+
+  if(is_daemon) {
+    fprintf(stderr,"WARNING: someone tried to become a daemon while we were already one!\n");
+    return;
+  }
+
+  if(logfile&&*logfile) {
+    newout_fd=open(logfile,O_WRONLY|O_CREAT|O_APPEND,S_IRUSR|S_IWUSR|S_IRGRP);
+    if(newout_fd==-1)
+      perror("civserver: couldn't open logfile");
+  }
+  switch(child=fork()) {
+  case -1:
+    perror("civserver: couldn't fork to background");
+    close(newout_fd);
+    break;
+  case 0:
+    is_daemon=1;
+    devnull_fd=open("/dev/null",O_RDONLY);
+    if(devnull_fd!=-1) {
+      close(0);
+      dup2(devnull_fd,0);
+    }
+    /* Just closing stdin caused stuff to fail (I have no clue why)
+     *  so I'm doing this now.
+     */
+    if(newout_fd!=-1) {
+      close(1);
+      dup2(newout_fd,1);
+      close(2);
+      dup2(newout_fd,2);
+    }
+    break;
+  default: /* Parent process */
+    printf("Pid of child daemon: %i\n",child);
+    _exit(0);
+  }
+}
 
 /**************************************************************************
 ...
Only in freeciv-1.7.2/server: plrhand.c~
diff -ur -x gui-xaw -x *.am -x *.xpm -x Makefile* -x *.o freeciv-1.7.2.patch/server/sernet.c freeciv-1.7.2/server/sernet.c
--- freeciv-1.7.2.patch/server/sernet.c Tue Feb  9 21:46:00 1999
+++ freeciv-1.7.2/server/sernet.c       Tue Feb  9 18:28:36 1999
@@ -97,7 +97,10 @@
     tv.tv_sec=1; tv.tv_usec=0;

     MY_FD_ZERO(&readfs);
-    FD_SET(0, &readfs);	
+
+    if(!is_daemon)
+      FD_SET(0, &readfs);
+
     FD_SET(sock, &readfs);
     max_desc=sock;