aux/realemu: run cpuproc in same fd group as fileserver

[plan9front.git] / sys / src / cmd / sam / cmd.c

diff --git a/sys/src/cmd/sam/cmd.c b/sys/src/cmd/sam/cmd.c
old mode 100755 (executable)
new mode 100644 (file)
index d34333d..6e8efa0
--- a/sys/src/cmd/sam/cmd.c
+++ b/sys/src/cmd/sam/cmd.c
@@ -35,6 +35,8 @@ Cmdtab cmdtab[]={
        '>',    0,      0,      0,      0,      aDot,   0,      linex,  plan9_cmd,
        '<',    0,      0,      0,      0,      aDot,   0,      linex,  plan9_cmd,
        '|',    0,      0,      0,      0,      aDot,   0,      linex,  plan9_cmd,
+       '^',    0,      0,      0,      0,      aDot,   0,      linex,  plan9_cmd,
+       '_',    0,      0,      0,      0,      aDot,   0,      linex,  plan9_cmd,
        '=',    0,      0,      0,      0,      aDot,   0,      linex,  eq_cmd,
        'c'|0x100,0,    0,      0,      0,      aNo,    0,      wordx,  cd_cmd,
        0,      0,      0,      0,      0,      0,      0,      0,
@@ -71,12 +73,18 @@ int
 inputc(void)
 {
        int n, nbuf;
-       char buf[3];
+       char buf[UTFmax];
        Rune r;
 
     Again:
        nbuf = 0;
-       if(downloaded){
+       if(cmdbufpos > cmdbuf.nc && cmdbuf.nc > 0){
+               cmdbufpos = 0;
+               bufreset(&cmdbuf);
+       }
+       if(cmdbufpos < cmdbuf.nc && cmdbuf.nc > 0)
+               bufread(&cmdbuf, cmdbufpos++, &r, 1);
+       else if(downloaded){
                while(termoutp == terminp){
                        cmdupdate();
                        if(patset)