tcleanup - plan9port - [fork] Plan 9 from user space
 (HTM) git clone git://src.adamsgaard.dk/plan9port
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit d27787fba7902466d65ef03f737a63ce168f4aa1
 (DIR) parent b5932d3d2a47d3cc111e84d6f015ce25242a83a9
 (HTM) Author: rsc <devnull@localhost>
       Date:   Fri, 18 Mar 2005 21:52:04 +0000
       
       cleanup
       
       Diffstat:
         M src/cmd/samterm/io.c                |      14 +++++++-------
         M src/cmd/samterm/main.c              |       1 -
         M src/cmd/samterm/samterm.h           |       2 +-
       
       3 files changed, 8 insertions(+), 9 deletions(-)
       ---
 (DIR) diff --git a/src/cmd/samterm/io.c b/src/cmd/samterm/io.c
       t@@ -104,6 +104,12 @@ waitforio(void)
                ulong type;
        
        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].v = &i;
                alts[RHost].op = CHANRCV;
       t@@ -122,12 +128,6 @@ again:
                if(block & (1<<RMouse))
                        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].v = nil;
                alts[RResize].op = CHANRCV;
       t@@ -262,7 +262,7 @@ ekbd(void)
        int
        kbdchar(void)
        {
       -        int i, c;
       +        int c, i;
        
                c = externchar();
                if(c > 0)
 (DIR) diff --git a/src/cmd/samterm/main.c b/src/cmd/samterm/main.c
       t@@ -50,7 +50,6 @@ threadmain(int argc, char *argv[])
                open("/dev/null", OREAD);
                if(open("/dev/tty", OWRITE) < 0)
                        open("/dev/null", OWRITE);
       -dup(2, 1);
        
                if(protodebug) print("getscreen\n");
                getscreen(argc, argv);
 (DIR) diff --git a/src/cmd/samterm/samterm.h b/src/cmd/samterm/samterm.h
       t@@ -88,7 +88,7 @@ extern int        hversion;
        extern int        plumbfd;
        extern int        hostfd[2];
        extern int        exiting;
       -extern int autoindent;
       +extern int        autoindent;
        
        #define gettext sam_gettext        /* stupid gcc built-in functions */
        Rune        *gettext(Flayer*, long, ulong*);