aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/fossil/Ccons.c
diff options
context:
space:
mode:
authorDavid du Colombier <0intro@gmail.com>2013-09-26 20:12:45 +0200
committerDavid du Colombier <0intro@gmail.com>2013-09-26 20:12:45 +0200
commitb32de4ae73509092107b116fefbc4003fefc35c3 (patch)
tree38d805028841990511fbe6a4efc12260a0a0a8e3 /src/cmd/fossil/Ccons.c
parent4b5766580559d101dd1c29cc575b3ffa9f51c2d7 (diff)
downloadplan9port-b32de4ae73509092107b116fefbc4003fefc35c3.tar.gz
plan9port-b32de4ae73509092107b116fefbc4003fefc35c3.tar.bz2
plan9port-b32de4ae73509092107b116fefbc4003fefc35c3.zip
fossil: required p9p changes
R=rsc https://codereview.appspot.com/13352057
Diffstat (limited to 'src/cmd/fossil/Ccons.c')
-rw-r--r--src/cmd/fossil/Ccons.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/cmd/fossil/Ccons.c b/src/cmd/fossil/Ccons.c
index afa02561..fed24d55 100644
--- a/src/cmd/fossil/Ccons.c
+++ b/src/cmd/fossil/Ccons.c
@@ -221,8 +221,9 @@ qAlloc(void)
}
static void
-consProc(void*)
+consProc(void* v)
{
+ USED(v);
Q *q;
int argc, i, n, r;
char *argv[20], buf[Nq], *lp, *wbuf;
@@ -345,13 +346,21 @@ consTTY(void)
name = "/dev/cons";
if((fd = open(name, ORDWR)) < 0){
+#ifdef PLAN9PORT
+ name = "/dev/tty";
+#else
name = "#c/cons";
+#endif
if((fd = open(name, ORDWR)) < 0){
werrstr("consTTY: open %s: %r", name);
return 0;
}
}
+#ifdef PLAN9PORT
+ USED(p);
+ ctl = 0;
+#else
p = smprint("%sctl", name);
if((ctl = open(p, OWRITE)) < 0){
close(fd);
@@ -367,6 +376,7 @@ consTTY(void)
return 0;
}
free(p);
+#endif
if(consOpen(fd, fd, ctl) == 0){
close(ctl);