This commit is contained in:
Russ Cox 2005-11-02 15:20:27 +00:00
parent 5d6ebf7a53
commit e4f9a4578a
7 changed files with 18 additions and 11 deletions

View File

@ -10,3 +10,7 @@ LDADD=-L/usr/X11R6/lib -lX11 -ggdb
LDFLAGS=-pthread
TARG=drawterm
# for root
libmachdep.a:
arch=`uname -m|sed 's/i.86/386/;s/Power Macintosh/power/'`; \
(cd posix-$$arch && make)

View File

@ -14,7 +14,7 @@ FS=fs-win32
IP=win32
OS=win32
GUI=win32
LDFLAGS=
LDFLAGS=-mwindows
LDADD=-lkernel32 -ladvapi32 -lgdi32 -lmpr -lwsock32
TARG=drawterm.exe
@ -28,3 +28,7 @@ TARG=drawterm.exe
#OS=win32
#GUI=win32
# for root
libmachdep.a:
(cd win32-386; make)

View File

@ -69,10 +69,3 @@ libc/libc.a:
gui-$(GUI)/libgui.a:
(cd gui-$(GUI); make)
#libmachdep.a:
# arch=`uname -m|sed 's/i.86/386/;s/Power Macintosh/power/'`; \
# (cd gcc$$arch && make)
libmachdep.a:
(cd posix-386; make)

View File

@ -244,3 +244,9 @@ extern int nrand(int);
extern long lrand(void);
extern long lnrand(long);
extern double frand(void);
extern ulong getcallerpc(void*);
extern char* cleanname(char*);
extern void sysfatal(char*, ...);
extern char* strecpy(char*, char*, char*);

View File

@ -456,7 +456,7 @@ kbdputc(Queue *q, int c)
kc[nk++] = c;
c = latin1(kc, nk);
if(c < -1) /* need more keystrokes */
return;
return 0;
if(c != -1) /* valid sequence */
_kbdputc(c);
else

View File

@ -59,7 +59,7 @@ kproc(char *name, void (*fn)(void*), void *arg)
p->fgrp = up->fgrp;
if(p->fgrp)
incref(&p->fgrp->ref);
strecpy(p->text, sizeof p->text, name);
strecpy(p->text, p->text+sizeof p->text, name);
osproc(p);
return p->pid;

View File

@ -195,7 +195,7 @@ SC_read(SConn *conn, uchar *buf, int n)
uchar count[2], digest[SHA1dlen];
int len, nr;
if(read(ss->fd, count, 2) != 2 || count[0]&0x80 == 0){
if(read(ss->fd, count, 2) != 2 || (count[0]&0x80) == 0){
werrstr("!SC_read invalid count");
return -1;
}