o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
rsc 2005-03-18 21:52:04 +00:00
parent b5932d3d2a
commit d27787fba7
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cmd/samterm/io.c
View file

@ -104,6 +104,12 @@ waitforio(void)
ulong type; ulong type;
again: again:
alts[RPlumb].c = plumbc;
alts[RPlumb].v = &i;
alts[RPlumb].op = CHANRCV;
if((block & (1<<RPlumb)) || plumbc == nil)
alts[RPlumb].op = CHANNOP;
alts[RHost].c = hostc; alts[RHost].c = hostc;
alts[RHost].v = &i; alts[RHost].v = &i;
alts[RHost].op = CHANRCV; alts[RHost].op = CHANRCV;
@ -122,12 +128,6 @@ again:
if(block & (1<<RMouse)) if(block & (1<<RMouse))
alts[RMouse].op = CHANNOP; alts[RMouse].op = CHANNOP;
alts[RPlumb].c = plumbc;
alts[RPlumb].v = &i;
alts[RPlumb].op = CHANRCV;
if((block & (1<<RPlumb)) || plumbc == nil)
alts[RPlumb].op = CHANNOP;
alts[RResize].c = mousectl->resizec; alts[RResize].c = mousectl->resizec;
alts[RResize].v = nil; alts[RResize].v = nil;
alts[RResize].op = CHANRCV; alts[RResize].op = CHANRCV;
@ -262,7 +262,7 @@ ekbd(void)
int int
kbdchar(void) kbdchar(void)
{ {
int i, c; int c, i;
c = externchar(); c = externchar();
if(c > 0) if(c > 0)

1
src/cmd/samterm/main.c
View file

@ -50,7 +50,6 @@ threadmain(int argc, char *argv[])
open("/dev/null", OREAD); open("/dev/null", OREAD);
if(open("/dev/tty", OWRITE) < 0) if(open("/dev/tty", OWRITE) < 0)
open("/dev/null", OWRITE); open("/dev/null", OWRITE);
dup(2, 1);
if(protodebug) print("getscreen\n"); if(protodebug) print("getscreen\n");
getscreen(argc, argv); getscreen(argc, argv);

2
src/cmd/samterm/samterm.h
View file

@ -88,7 +88,7 @@ extern int hversion;
extern int plumbfd; extern int plumbfd;
extern int hostfd[2]; extern int hostfd[2];
extern int exiting; extern int exiting;
extern int autoindent; extern int autoindent;
#define gettext sam_gettext /* stupid gcc built-in functions */ #define gettext sam_gettext /* stupid gcc built-in functions */
Rune *gettext(Flayer*, long, ulong*); Rune *gettext(Flayer*, long, ulong*);