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

debugging for sam, and an old fix forgotten

Browse source
This commit is contained in:
rsc 2005-01-07 18:03:36 +00:00
parent b80755cf2d
commit a19ff5b204
11 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,20 +33,27 @@ void
initio(void)
{
threadsetname("main");
if(protodebug) print("mouse\n");
mousectl = initmouse(nil, display->image);
if(mousectl == nil){
fprint(2, "samterm: mouse init failed: %r\n");
threadexitsall("mouse");
}
mousep = &mousectl->m;
if(protodebug) print("kbd\n");
keyboardctl = initkeyboard(nil);
if(keyboardctl == nil){
fprint(2, "samterm: keyboard init failed: %r\n");
threadexitsall("kbd");
}
if(protodebug) print("hoststart\n");
hoststart();
if(plumbstart() < 0)
if(protodebug) print("plumbstart\n");
if(plumbstart() < 0){
if(protodebug) print("extstart\n");
extstart();
}
if(protodebug) print("initio done\n");
}
void

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

@ -44,15 +44,22 @@ threadmain(int argc, char *argv[])
close(0);
close(1);
open("/dev/null", OREAD);
dup(2, 1);
if(open("/dev/tty", OWRITE) < 0)
open("/dev/null", OWRITE);
dup(2, 1);
if(protodebug) print("getscreen\n");
getscreen(argc, argv);
if(protodebug) print("iconinit\n");
iconinit();
if(protodebug) print("initio\n");
initio();
if(protodebug) print("scratch\n");
scratch = alloc(100*RUNESIZE);
nscralloc = 100;
r = screen->r;
r.max.y = r.min.y+Dy(r)/5;
if(protodebug) print("flstart\n");
flstart(screen->clipr);
rinit(&cmd.rasp);
flnew(&cmd.l[0], gettext, 1, &cmd);
@ -64,6 +71,7 @@ threadmain(int argc, char *argv[])
startnewfile(Tstartcmdfile, &cmd);
got = 0;
if(protodebug) print("loop\n");
for(;;got = waitforio()){
if(hasunlocked && RESIZED())
resize();

2
src/cmd/samterm/plan9.c
View file

@ -158,7 +158,7 @@ extstart(void)
}
}
fd = open(exname, OREAD|O_NONBLOCK);
fd = open(exname, OREAD|ONONBLOCK);
if(fd == -1){
removeextern();
return;