From 87a86749ffc0bea9dd1f0a5f0bb2d2bc244038e0 Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Sat, 23 Mar 2002 22:47:44 +0000 Subject: [PATCH] win32gui: make error() work - in 3.4.0 it was useless in the graphical port. --- doc/fixes34.1 | 1 + sys/share/pcunix.c | 5 +++++ sys/winnt/winnt.c | 13 ++++++++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/doc/fixes34.1 b/doc/fixes34.1 index d6ab81e05..3414b3453 100644 --- a/doc/fixes34.1 +++ b/doc/fixes34.1 @@ -19,4 +19,5 @@ wall symbol not replaced when digging while blind and levitating Platform- and/or Interface-Specific Fixes ----------------------------------------- +win32gui: make error() work; it was essentially non-operative in 3.4.0 win32tty: honour the use_inverse option and default to ATR_BOLD if disabled diff --git a/sys/share/pcunix.c b/sys/share/pcunix.c index 0064e3390..2ec56227a 100644 --- a/sys/share/pcunix.c +++ b/sys/share/pcunix.c @@ -117,7 +117,12 @@ getlock() if((fd = open(fq_lock,0)) == -1) { if(errno == ENOENT) goto gotlock; /* no such file */ chdirx(orgdir, 0); +#if defined(WIN32) + error("Bad directory or name: %s\n%s\n", + fq_lock, strerror(errno)); +#else perror(fq_lock); +#endif unlock_file(HLOCK); error("Cannot open %s", fq_lock); } diff --git a/sys/winnt/winnt.c b/sys/winnt/winnt.c index 5c7ebb5ee..8af3c4573 100644 --- a/sys/winnt/winnt.c +++ b/sys/winnt/winnt.c @@ -209,9 +209,16 @@ error VA_DECL(const char *,s) VA_INIT(s, const char *); /* error() may get called before tty is initialized */ if (iflags.window_inited) end_screen(); - putchar('\n'); - Vprintf(s,VA_ARGS); - putchar('\n'); + if (!strncmpi(windowprocs.name, "tty", 3)) { + putchar('\n'); + Vprintf(s,VA_ARGS); + putchar('\n'); + } else { + char buf[BUFSZ]; + (void) vsprintf(buf, s, VA_ARGS); + Strcat(buf, "\n"); + raw_printf(buf); + } VA_END(); exit(EXIT_FAILURE); } -- 2.40.0