nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Get rid of fatalbox() completely.

Browse Source 
It's an incoherent concept! There should not be any such thing as an
error box that terminates the entire program but is not modal. If it's
bad enough to terminate the whole program, i.e. _all_ currently live
connections, then there's no point in permitting progress to continue
in windows other than the affected one, because all windows are
affected anyway.

So all previous uses of fatalbox() have become modalfatalbox(), except
those which looked to me as if they shouldn't have been fatal in the
first place, e.g. lingering pieces of error handling in winnet.c which
ought to have had the severity of 'give up on this particular Socket
and close it' rather than 'give up on the ENTIRE UNIVERSE'.
This commit is contained in:
Simon Tatham
2017-11-26 17:43:02 +00:00
parent d1f62c3e0f
commit 4f3f4ed691
11 changed files with 26 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
terminal.c
View File

@ -1085,19 +1085,19 @@ static termline *lineptr(Terminal *term, int y, int lineno, int screen)
/* We assume that we don't screw up and retrieve something out of range. */
if (line == NULL) {
fatalbox("line==NULL in terminal.c\n"
"lineno=%d y=%d w=%d h=%d\n"
"count(scrollback=%p)=%d\n"
"count(screen=%p)=%d\n"
"count(alt=%p)=%d alt_sblines=%d\n"
"whichtree=%p treeindex=%d\n\n"
"Please contact <putty@projects.tartarus.org> "
"and pass on the above information.",
lineno, y, term->cols, term->rows,
term->scrollback, count234(term->scrollback),
term->screen, count234(term->screen),
term->alt_screen, count234(term->alt_screen), term->alt_sblines,
whichtree, treeindex);
modalfatalbox("line==NULL in terminal.c\n"
"lineno=%d y=%d w=%d h=%d\n"
"count(scrollback=%p)=%d\n"
"count(screen=%p)=%d\n"
"count(alt=%p)=%d alt_sblines=%d\n"
"whichtree=%p treeindex=%d\n\n"
"Please contact <putty@projects.tartarus.org> "
"and pass on the above information.",
lineno, y, term->cols, term->rows,
term->scrollback, count234(term->scrollback),
term->screen, count234(term->screen),
term->alt_screen, count234(term->alt_screen),
term->alt_sblines, whichtree, treeindex);
}
assert(line != NULL);