fiddlerwoaroof/crawl - Change C7WZ2EB2RK7JH5UG34EHFFOLHG5UVJU7BDRJ5J5GCB2ZRIVQGLGAC

Generalized solution to the "disconnect at --more--" problem (e.g., disconnect

at the more after "You have lost your religion!" to avoid the negative consequences of excommunication): when a HUP signal is received, instead of immediately saving the game, close the stdin stream, which will cause all of the Curses calls which normal block on key-presses to unblock, so that the code after a more() call will execute before the disconnected game is saved (which will happen in _input() in acr.cc). This only affects Curses (non-tiles/console) UNIX builds which have both USE_UNIX_SIGNALS and SIGHUP_SAVE defined.

Exceptions to the above:

If HUP is received during a call to yesno() with safeanswer == 0, then the game will be saved immediately, since there's no way for the function to tell which answer is safe to give automatically.
If HUP is received while selecting the target for a controlled teleport then the teleport will be canceled, since otherwise a target other than the intended one might be the one under the cursor when the disconnect happened.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10443 c06c8d41-db1a-0410-9941-cceddc491573

Created by zelgadis on July 28, 2009

C7WZ2EB2RK7JH5UG34EHFFOLHG5UVJU7BDRJ5J5GCB2ZRIVQGLGAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 3525 [6.16817]

[6.75370]

[7.3332]

#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
        // If we've received a HUP signal then the user can't choose a
        // location, so indicate this by returning an invalid position.
        if (crawl_state.seen_hups)
        {
            spec_place = coord_def(-1, -1);
            return;
        }
#endif

Replacement in crawl-ref/source/stuff.cc at line 793 [6.224557]

B:BD[8.217] → [9.1655:1696]

    if (exit_code && !crawl_state.arena)

[8.217]

[10.90]

    if (exit_code && !crawl_state.arena && !crawl_state.seen_hups)

Insertion in crawl-ref/source/stuff.cc at line 1082 [6.224557]

[4.462]

[6.239424]


#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
        // Prevent infinite loop if Curses HUP signal handling happens;
        // if there is no safe answer, then just save-and-exit immediately,
        // since there's no way to know if it would be better to return
        // true or false.
        if (crawl_state.seen_hups && !safeanswer)
            sighup_save_and_exit();
#endif

Replacement in crawl-ref/source/stuff.cc at line 1097 [6.224557]

B:BD[2.3210] → [2.3210:3258]

                || tmp == '\r' || tmp == '\n'))

[2.3210]

[11.10933]

                || tmp == '\r' || tmp == '\n' || crawl_state.seen_hups))

Replacement in crawl-ref/source/stuff.cc at line 1193 [6.224557]

B:BD[12.106365] → [2.3259:3340]

        if (tmp == CK_ESCAPE || tmp == CONTROL('G') || tmp == 'q' || tmp == 'Q')

[12.106365]

[13.71365]

        if (tmp == CK_ESCAPE || tmp == CONTROL('G') || tmp == 'q' || tmp == 'Q'
            || crawl_state.seen_hups)
        {

Insertion in crawl-ref/source/stuff.cc at line 1197 [6.224557]
[13.71388]
[14.2855]
```
        }
```

Insertion in crawl-ref/source/spells3.cc at line 1322 [6.531613]

[15.2483]

[6.549821]


#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
            // If we've received a HUP signal then the user can't choose a
            // location, so cancel the teleport.
            if (crawl_state.seen_hups)
            {
                mpr("Controlled teleport interrupted by HUP signal, "
                    "cancelling teleport.", MSGCH_ERROR);
                you.turn_is_over = false;
                return (false);
            }
#endif

Insertion in crawl-ref/source/religion.cc at line 6564 [6.804403]
[6.877392]
[5.2706]
```
    more();
```
Insertion in crawl-ref/source/religion.cc at line 7393 [6.804403]
[16.3789]
[17.2663]
```
    more();
```
Replacement in crawl-ref/source/message.cc at line 1032 [6.1993826]
B:BD[6.2001474] → [3.2713:2747]
```
    if (crawl_state.game_crashed)
```
[6.2001474]
[3.2747]
```
    if (crawl_state.game_crashed || crawl_state.seen_hups)
```

Insertion in crawl-ref/source/libunix.h at line 70 [6.2548819]

[18.5811]

[19.1177]


#if defined(SIGHUP_SAVE) && defined(USE_UNIX_SIGNALS)
void sighup_save_and_exit();
#endif

Insertion in crawl-ref/source/libunix.cc at line 34 [6.2550041]
[18.5830]
[6.2551705]
```
#include "delay.h"
```

Insertion in crawl-ref/source/libunix.cc at line 332 [6.2550041]

[20.1082]

        return;
    interrupt_activity( AI_FORCE_INTERRUPT );
#ifdef USE_TILE
    // XXX: Will a tiles build ever need to handle the HUP signal?
    sighup_save_and_exit();
#elif defined(USE_CURSES)
    // When using Curses, closing stdin will cause any Curses call blocking
    // on key-presses to immediately return, including any call that was
    // still blocking in the main thread when the HUP signal was caught.
    // This should guarantee that the main thread will un-stall and
    // will eventually return to _input() in acr.cc, which will then
    // call sighup_save_and_exit().
    //
    // The point to all this is that if a user is playing a game on a
    // remote server and disconnects at a --more-- prompt, that when
    // the player reconnects the code behind the more() call will execute
    // before the disconnected game is saved, thus (for example) preventing
    // the hack of avoiding excomunication consesquences because of the
    // more() after "You have lost your religion!"
    fclose(stdin);
#else
     #error "Must use either Curses or tiles on Unix"
#endif
}
void sighup_save_and_exit()
{
    if (crawl_state.seen_hups == 0)
    {
        mpr("sighup_save_and_exit() called without a HUP signal; please"
            "file a bug report", MSGCH_ERROR);

Insertion in crawl-ref/source/libunix.cc at line 366 [6.2550041]
[20.1098]
[6.2555797]
```
    }
```

Insertion in crawl-ref/source/libunix.cc at line 374 [6.2550041]

[20.1257]

[21.2923]

        mpr("Received HUP signal, saved and exited game.", MSGCH_ERROR);

Replacement in crawl-ref/source/libunix.cc at line 382 [6.2550041]

∅:D[21.3125] → [20.1257:1356]

B:BD[20.1257] → [20.1257:1356]

        // save_game(true) also exits, saving us the trouble of doing so.
        save_game(true);

[21.3125]

[20.1356]

        // save_game(true) exits from the game. The "true" is also required
        // to save changes to the current level.
        save_game(true, "Received HUP signal, saved game.");

Replacement in crawl-ref/source/libunix.cc at line 387 [6.2550041]

B:BD[20.1371] → [20.1371:1520]

    {
        // CROAK! No attempt to clean up curses. This is probably not an
        // issue since the term has gone away.
        exit(1);
    }

[20.1371]

[20.1520]

        end(0, false, "Received HUP signal, game already saved.");

Insertion in crawl-ref/source/libunix.cc at line 844 [6.2550041]

[6.2566323]


    // Don't return a partial string if a HUP signal interrupted things.
    if (crawl_state.seen_hups)
        buff[0] = '\0';

Replacement in crawl-ref/source/effects.cc at line 1578 [6.3382105]

B:BD[22.15136] → [22.15136:15155]

            break;

[22.15136]

[23.1918]


#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
            // If we've gotten a HUP signal then the player will be unable
            // to make a selection.
            if (crawl_state.seen_hups)
            {
                mpr("Acquirement interrupted by HUP signal.", MSGCH_ERROR);
                you.turn_is_over = false;
                return (false);
            }
#endif
           break;

Insertion in crawl-ref/source/directn.cc at line 140 [6.3697945]

[24.5709]

[25.203]


#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
        // If we've received a HUP signal then the user can't choose a
        // target.
        if (crawl_state.seen_hups)
        {
            moves.isValid  = false;
            moves.isCancel = true;
            mpr("Targetting interrupted by HUP signal.", MSGCH_ERROR);
            return;
        }
#endif

Insertion in crawl-ref/source/directn.cc at line 1080 [6.3697945]

[26.5787]

[27.4607]

#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
        // If we've received a HUP signal then the user can't choose a
        // target.
        if (crawl_state.seen_hups)
        {
            moves.isValid  = false;
            moves.isCancel = true;
            mpr("Targetting interrupted by HUP signal.", MSGCH_ERROR);
            return;
        }
#endif

Insertion in crawl-ref/source/cio.cc at line 429 [18.15671]

[18.23019]

#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
        // Don't return a partial string if a HUP signal interrupted things
        if (crawl_state.seen_hups)
        {
            buffer[0] = '\0';
            return (0);
        }
#endif

Insertion in crawl-ref/source/acr.cc at line 888 [6.4397395]

[28.839]

[29.5303]

#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
    if (crawl_state.seen_hups)
        sighup_save_and_exit();
#endif

Insertion in crawl-ref/source/acr.cc at line 1037 [6.4397395]

[18.28216]

[30.14168]

#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
        if (crawl_state.seen_hups)
            sighup_save_and_exit();
#endif

Insertion in crawl-ref/source/acr.cc at line 2492 [6.4397395]
[31.1580]
[32.10714]
```
            more();
```