Return to dgamelaunch after the game ends.

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@420 db0b04b0-f4d1-0310-9a6d-de3e77497b0e

diff --git a/dgamelaunch.c b/dgamelaunch.c
index ff8b1b7f30911a643207e9c5b1ebfa77423012f0..6e2806acbd8a4a882211595497449311716fbfc0 100644 (file)
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -2059,103 +2059,58 @@ main (int argc, char** argv)
       }
     }
   }
-  
-  initcurses ();
-
-  userchoice = menuloop();
-
-  assert (loggedin);
-
-  if ((userchoice >= 0) && (userchoice <= num_games)) {
-      while (!purge_stale_locks(userchoice)) {
-         userchoice = gamemenuloop(userchoice);
-      }
-      if (!((userchoice >= 0) && (userchoice <= num_games)))
-         graceful_exit (1);
-  } else {
-      graceful_exit (1);
-  }
 
-  if (myconfig[userchoice]->rcfile) {
-      if (access (dgl_format_str(userchoice, me, myconfig[userchoice]->rc_fmt), R_OK) == -1)
-         write_canned_rcfile (userchoice, dgl_format_str(userchoice, me, myconfig[userchoice]->rc_fmt));
-  }
+  while (1) {
+      initcurses ();
 
-  setproctitle("%s [playing %s]", me->username, myconfig[userchoice]->shortname);
+      userchoice = menuloop();
 
-  endwin ();
-  signal(SIGWINCH, SIG_DFL);
+      assert (loggedin);
 
-  /* first run the generic "do these when a game is started" commands */
-  dgl_exec_cmdqueue(globalconfig.cmdqueue[DGLTIME_GAMESTART], userchoice, me);
-  /* then run the game-specific commands */
-  dgl_exec_cmdqueue(myconfig[userchoice]->cmdqueue, userchoice, me);
+      if ((userchoice >= 0) && (userchoice <= num_games)) {
+         while (!purge_stale_locks(userchoice)) {
+             userchoice = gamemenuloop(userchoice);
+         }
+         if (!((userchoice >= 0) && (userchoice <= num_games)))
+             graceful_exit (1);
+      } else {
+         graceful_exit (1);
+      }
 
-  /*
-  if (!backup_savefile (userchoice))
-    graceful_exit (5);
-  */
+      if (myconfig[userchoice]->rcfile) {
+         if (access (dgl_format_str(userchoice, me, myconfig[userchoice]->rc_fmt), R_OK) == -1)
+             write_canned_rcfile (userchoice, dgl_format_str(userchoice, me, myconfig[userchoice]->rc_fmt));
+      }
 
-  /* environment */
-  /*
-  if (myconfig[userchoice]->rcfile) {
-      snprintf (atrcfilename, 81, "@%s", dgl_format_str(userchoice, me, myconfig[userchoice]->rc_fmt));
-      mysetenv ("NETHACKOPTIONS", atrcfilename, 1);
-  }
-  */
+      setproctitle("%s [playing %s]", me->username, myconfig[userchoice]->shortname);
 
-  /*
-  len = strlen(myconfig[userchoice]->spool) + strlen (me->username) + 1;
-  spool = malloc (len + 1);
-  snprintf (spool, len + 1, "%s/%s", myconfig[userchoice]->spool, me->username);
+      endwin ();
+      signal(SIGWINCH, SIG_DFL);
 
-  mysetenv ("MAIL", spool, 1);
-  mysetenv ("SIMPLEMAIL", "1", 1);
-  */
+      /* first run the generic "do these when a game is started" commands */
+      dgl_exec_cmdqueue(globalconfig.cmdqueue[DGLTIME_GAMESTART], userchoice, me);
+      /* then run the game-specific commands */
+      dgl_exec_cmdqueue(myconfig[userchoice]->cmdqueue, userchoice, me);
 
-  /* don't let the mail file grow */
-  /*
-  if (access (spool, F_OK) == 0)
-    unlink (spool);
+      /* fix the variables in the arguments */
+      for (i = 0; i < myconfig[userchoice]->num_args; i++) {
+         tmp = strdup(dgl_format_str(userchoice, me, myconfig[userchoice]->bin_args[i]));
+         free(myconfig[userchoice]->bin_args[i]);
+         myconfig[userchoice]->bin_args[i] = tmp;
+      }
 
-  free (spool);
-  */
+      /* launch program */
+      ttyrec_main (userchoice, me->username, gen_ttyrec_filename());
 
-  /* fix the variables in the arguments */
-  for (i = 0; i < myconfig[userchoice]->num_args; i++) {
-      tmp = strdup(dgl_format_str(userchoice, me, myconfig[userchoice]->bin_args[i]));
-      free(myconfig[userchoice]->bin_args[i]);
-      myconfig[userchoice]->bin_args[i] = tmp;
+      setproctitle ("%s", me->username);
   }
 
-  /* launch program */
-  ttyrec_main (userchoice, me->username, gen_ttyrec_filename());
-
   /* NOW we can safely kill this */
   freefile ();
 
-  /*
-  printf("config:'%s'\n", config);
-
-  printf("chroot:'%s'\n", globalconfig.chroot);
-  printf("gamepath:'%s'\n", myconfig[userchoice]->game_path);
-  printf("game:'%s'\n", myconfig[userchoice]->game_name);
-  printf("dglroot:'%s'\n", globalconfig.dglroot);
-  printf("lockfile:'%s'\n", globalconfig.lockfile);
-  printf("passwd:'%s'\n", globalconfig.passwd);
-  printf("banner:'%s'\n", globalconfig.banner);
-  printf("rcfile:'%s'\n", myconfig[userchoice]->rcfile);
-  printf("spool:'%s'\n", myconfig[userchoice]->spool);
-  printf("savefilefmt:'%s'\n", myconfig[userchoice]->savefilefmt);
-  printf("dgl_format_str(savefilefmt):'%s'\n", dgl_format_str(userchoice, myconfig[userchoice]->savefilefmt));
-  printf("inprogressdir:'%s'\n", myconfig[userchoice]->inprogressdir);
-  */
-
   if (me)
     free (me);
 
-  /* FIXME: free data in globalconfig */
-
   graceful_exit (1);
 
   return 1;

diff --git a/ttyrec.c b/ttyrec.c
index 45ffb9938e8bc90f9ade12d18cf3235aa6ed15aa..bc3c06a06f50a86e757b801ca248b7177ebfbaba 100644 (file)
--- a/ttyrec.c
+++ b/ttyrec.c
@@ -72,8 +72,11 @@
 
 int slave;
 pid_t child, subchild;
+pid_t input_child;
 char* ipfile = NULL;
 
+volatile int wait_for_menu = 0;
+
 FILE *fscript;
 int master;
 
@@ -86,6 +89,8 @@ ttyrec_main (int game, char *username, char* ttyrec_filename)
 {
   char dirname[100];
 
+  child = subchild = input_child = 0;
+
   snprintf (dirname, 100, "%sttyrec/%s/%s", globalconfig.dglroot, username,
             ttyrec_filename);
 
@@ -123,10 +128,26 @@ ttyrec_main (int game, char *username, char* ttyrec_filename)
       else
          doshell (game, username);
     }
-  doinput ();
+
+  (void) fclose (fscript);
+
+  wait_for_menu = 1;
+  input_child = fork();
+  if (input_child < 0)
+  {
+      perror ("fork2");
+      fail ();
+  }
+  if (!input_child)
+      doinput ();
+  else
+  {
+      while (wait_for_menu)
+         sleep(1);
+  }
 
   unlink (ipfile);
-  
+
   return 0;
 }
 
@@ -136,7 +157,6 @@ doinput ()
   register int cc;
   char ibuf[BUFSIZ];
 
-  (void) fclose (fscript);
   while ((cc = read (0, ibuf, BUFSIZ)) > 0)
     (void) write (master, ibuf, cc);
   done ();
@@ -158,7 +178,17 @@ finish (int sig)
   }
 
   if (die)
-    done ();
+  {
+      if (wait_for_menu && input_child)
+      {
+         // Need to kill the child that's writing input to pty.
+         kill(input_child, SIGTERM);
+         while ((pid = wait3(&status, WNOHANG, 0)) > 0);
+         wait_for_menu = 0;
+      }
+      else
+         done ();
+  }
 }
 
 struct linebuf