From acfec7933ee109cca0cdbee79297332f880cbaab Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@stack.nl>
Date: Sun, 4 Jan 2004 02:31:00 +0000
Subject: [PATCH] Terminate if user chooses not to kill a hung game, and don't
 delete lockfile in that case. Move purge_stale_locks() call to before final
 endwin() in main().

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@69 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
---
 dgamelaunch.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/dgamelaunch.c b/dgamelaunch.c
index b8a2b5c..7c41954 100644
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -1130,7 +1130,7 @@ purge_stale_locks (void)
       char *colon;
       char buf[16];
       pid_t pid;
-      int seconds = 0;
+      int seconds;
 
       if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
 	  continue;
@@ -1150,7 +1150,6 @@ purge_stale_locks (void)
         graceful_exit (203);
 
       fclose (ipfile);
-      unlink (dent->d_name);
 
       pid = atoi (buf);
 
@@ -1159,6 +1158,7 @@ purge_stale_locks (void)
       errno = 0;
 
       /* Wait for it to stop running */
+      seconds = 0;
       while (kill (pid, 0) == 0)
         {
           seconds++;
@@ -1175,9 +1175,16 @@ purge_stale_locks (void)
                   kill (pid, SIGTERM);
                   break;
                 }
+	      else
+		{
+                  endwin();
+		  fprintf(stderr, "Sorry, no nethack for you now, please "
+			"contact the admin.\n");
+		  graceful_exit(1);
+		}
             }
         }
-      seconds = 0;
+      unlink (dent->d_name);
     }
 
   closedir (pdir);
@@ -1285,7 +1292,7 @@ main (void)
   assert (loggedin);
 
   purge_stale_locks ();
-  
+
   endwin ();
 
   /* environment */