tBug fixes from Scott Schwartz. - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 6b2d0fd94642d4e041bffac34cb79eaf9169760b
DIR parent eeb7312231d91d32c561fd9dd07aeed554ba998d
HTML Author: rsc <devnull@localhost>
Date: Fri, 26 Mar 2004 03:45:55 +0000
Bug fixes from Scott Schwartz.
Try to make 9term not crash when X errors happen.
Diffstat:
M src/cmd/dict/world.c | 2 ++
M src/cmd/ed.c | 2 ++
M src/cmd/mc.c | 3 ++-
M src/libdraw/x11-init.c | 3 +++
4 files changed, 9 insertions(+), 1 deletion(-)
---
DIR diff --git a/src/cmd/dict/world.c b/src/cmd/dict/world.c
t@@ -11,6 +11,8 @@
#define GSHORT(p) (((p)[0]<<8)|(p)[1])
+#define putchar dictputchar
+
static void putchar(int, int*);
#define NONE 0xffff
DIR diff --git a/src/cmd/ed.c b/src/cmd/ed.c
t@@ -6,6 +6,8 @@
#include <bio.h>
#include <regexp.h>
+#undef EOF /* stdio? */
+
enum
{
FNSIZE = 128, /* file name */
DIR diff --git a/src/cmd/mc.c b/src/cmd/mc.c
t@@ -8,10 +8,11 @@
*
*/
#include <u.h>
+#include <sys/ioctl.h>
+#include <sys/termios.h>
#include <libc.h>
#include <draw.h>
#include <bio.h>
-#include <sys/ioctl.h>
#define WIDTH 80
#define TAB 4
DIR diff --git a/src/libdraw/x11-init.c b/src/libdraw/x11-init.c
t@@ -127,6 +127,9 @@ xerror(XDisplay *d, XErrorEvent *e)
if(e->request_code == 42) /* XSetInputFocus */
return 0;
+ if(e->request_code == 18) /* XChangeProperty */
+ return 0;
+
print("X error: error_code=%d, request_code=%d, minor=%d disp=%p\n",
e->error_code, e->request_code, e->minor_code, d);
XGetErrorText(d, e->error_code, buf, sizeof buf);