Adjust auto-recovery feedback.

Inspired by a very recent NetHack 3.7 update (git commit b37f140), I've
adjusted the feedback when recovering a crashed game. Takes up much less
space than previously.

The NetHack devteam's solution for auto-recovery is more elegant than
the one currently in place, but using it will need to wait until
EvilHack is ported over to 3.7 codebase.

Author: k21971

doc/evilhack-changelog.md

@@ -3344,4 +3344,5 @@ The following changes to date are:
 - Fix: allow spear traps to be disarmed
 - Fix: heap-use-after-free (bones)
 - Fix: follow up to crash when examining discoveries with '`' in certain cases
+- Adjust auto-recovery feedback
 

sys/unix/unixunix.c

@@ -167,14 +167,15 @@ getlock()
             goto gotlock;
         (void) close(fd);
 
-      {
+        /* drop the "perm" lock while the user decides */
+        unlock_file(HLOCK);
         if (iflags.window_inited) {
             /* this is a candidate for paranoid_confirmation */
-            c = yn_function("There is already a game in progress under your name.  Recover it [r], Destroy old game [y], Cancel [n] ?", "ryn", 'n');
+            c = yn_function("Old game in progress.  Destroy [y], Recover [r], or Cancel [n]?", "ynr", 'n');
         } else {
             (void) printf("\nThere is already a game in progress under your name.  Do what?\n");
-            (void) printf("\n  r - Try to recover it?");
-            (void) printf("\n  y - Destroy old game?");
+            (void) printf("\n  y - Destroy old game");
+            (void) printf("\n  r - Try to recover it");
             (void) printf("\n  n - Cancel");
             (void) printf("\n\n  => ");
             (void) fflush(stdout);
@@ -184,10 +185,10 @@ getlock()
             (void) printf("\033[7A"); /* cursor up 7 */
             (void) printf("\033[J"); /* clear from cursor down */
         }
-      }
+
         if (c == 'r' || c == 'R') {
             if (restore_savefile(lock, fqn_prefix[SAVEPREFIX]) == 0) {
-                const char *msg = "Automatic recovery of save file successful!  "
+                const char *msg = "Automatic recovery of game successful!  "
                                   "Press any key to continue...\n";
                 fflush(stdout);
                 if (iflags.window_inited) {