nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 11:02: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

12
unix/gtkdlg.c
View File

@ -3705,18 +3705,6 @@ void nonfatal_message_box(void *window, const char *msg)
FALSE, &buttons_ok);
}
void fatalbox(const char *p, ...)
{
va_list ap;
char *msg;
va_start(ap, p);
msg = dupvprintf(p, ap);
va_end(ap);
fatal_message_box(NULL, msg);
sfree(msg);
cleanup_exit(1);
}
void nonfatal(const char *p, ...)
{
va_list ap;

10
unix/uxpgnt.c
View File

@ -23,16 +23,6 @@
SockAddr unix_sock_addr(const char *path);
Socket new_unix_listener(SockAddr listenaddr, Plug plug);
void fatalbox(const char *p, ...)
{
va_list ap;
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
exit(1);
}
void modalfatalbox(const char *p, ...)
{
va_list ap;

17
unix/uxplink.c
View File

@ -29,23 +29,6 @@ static void *logctx;
static struct termios orig_termios;
void fatalbox(const char *p, ...)
{
struct termios cf;
va_list ap;
premsg(&cf);
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
postmsg(&cf);
if (logctx) {
log_free(logctx);
logctx = NULL;
}
cleanup_exit(1);
}
void modalfatalbox(const char *p, ...)
{
struct termios cf;