summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@gmx.de>2012-08-05 15:51:38 +0200
committercinap_lenrek <cinap_lenrek@gmx.de>2012-08-05 15:51:38 +0200
commit6a443a3e6ada7b4af40f1ce0b890122dcb3fb8ef (patch)
tree9a121c07ba14de5c504677e688d0a28602b7baf9
parent8f9374e811504c8d772d41b2fbe8f578ae1b7e14 (diff)
parente2270b09f3da5b63cfaab6ec1650678bb6918a0d (diff)
downloadplan9front-6a443a3e6ada7b4af40f1ce0b890122dcb3fb8ef.tar.xz
merge
-rw-r--r--sys/src/cmd/ip/telnetd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/src/cmd/ip/telnetd.c b/sys/src/cmd/ip/telnetd.c
index 395c3ee13..83de53db4 100644
--- a/sys/src/cmd/ip/telnetd.c
+++ b/sys/src/cmd/ip/telnetd.c
@@ -574,14 +574,14 @@ conssim(void)
char *field[10];
/* a pipe to simulate the /dev/cons */
- if(bind("#|", "/mnt/cons/cons", MREPL) < 0)
+ if(bind("#|", "/mnt/cons", MREPL) < 0)
fatal("/dev/cons1", 0, 0);
- if(bind("/mnt/cons/cons/data1", "/dev/cons", MREPL) < 0)
+ if(bind("/mnt/cons/data1", "/dev/cons", MREPL) < 0)
fatal("/dev/cons2", 0, 0);
/* a pipe to simulate consctl */
- if(bind("#|", "/mnt/cons/consctl", MBEFORE) < 0
- || bind("/mnt/cons/consctl/data1", "/dev/consctl", MREPL) < 0)
+ if(bind("#|", "/mnt/consctl", MBEFORE) < 0
+ || bind("/mnt/consctl/data1", "/dev/consctl", MREPL) < 0)
fatal("/dev/consctl", 0, 0);
/* a process to read /dev/consctl and set the state in cons */
@@ -591,13 +591,13 @@ conssim(void)
case 0:
break;
default:
- return open("/mnt/cons/cons/data", ORDWR);
+ return open("/mnt/cons/data", ORDWR);
}
for(tries = 0; tries < 100; tries++){
cons->raw = 0;
cons->hold = 0;
- fd = open("/mnt/cons/consctl/data", OREAD);
+ fd = open("/mnt/consctl/data", OREAD);
if(fd < 0)
continue;
tries = 0;