ape: fix fread/fwrite, python: disable bytecode dumps, inst: rename textonly to start and remove inst/gui, add sys/lib/rootbind, cisfd(8) manpage

7 files changed, 13 insertions, 16 deletions

diff --git a/rc/bin/inst/gui b/rc/bin/inst/gui
deleted file mode 100755
index afb0981d0..000000000
--- a/rc/bin/inst/gui
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/rc
-
-cd /bin/inst
-echo blanktime 0 >/dev/vgactl
-. defs
-
-startwin 640 480
diff --git a/rc/bin/inst/textonly b/rc/bin/inst/start
index 3b08dfa8d..dbaa7a199 100755
--- a/rc/bin/inst/textonly
+++ b/rc/bin/inst/start
@@ -1,6 +1,5 @@
 #!/bin/rc
 
-# text-only install
 cd /bin/inst
 . defs
 
diff --git a/sys/lib/rootbind b/sys/lib/rootbind
new file mode 100755
index 000000000..c2e937f9f
--- /dev/null
+++ b/sys/lib/rootbind
@@ -0,0 +1,4 @@
+bind `{pwd} /n/src9
+bind /n/src9/386/bin /bin
+bind -a /n/src9/rc/bin /bin
+for(i in 386 rc acme mail sys lib cron){bind -c /n/src9/$i /$i}
diff --git a/sys/man/8/cifsd b/sys/man/8/cifsd
index 276421f48..a1187301e 100644
--- a/sys/man/8/cifsd
+++ b/sys/man/8/cifsd
@@ -1,7 +1,8 @@
-.TH cifsd 8
+.TH CIFSD 8
 .SH NAME
 cifsd \- CIFS/SMB network daemon
 .SH SYNOPSIS
+.PP
 .B ip/cifsd
 [
 .B -t
diff --git a/sys/src/ape/lib/ap/stdio/fread.c b/sys/src/ape/lib/ap/stdio/fread.c
index cf66c54fb..c064a5649 100644
--- a/sys/src/ape/lib/ap/stdio/fread.c
+++ b/sys/src/ape/lib/ap/stdio/fread.c
@@ -20,7 +20,7 @@ size_t fread(void *p, size_t recl, size_t nrec, FILE *f){
 			memcpy(s, f->rp, d);
 			f->rp+=d;
 		}else{
-			if(n >= BIGN && f->state==RD && !(f->flags&STRING) && f->buf!=f->unbuf || f->buf == f->unbuf){
+			if(f->buf==f->unbuf || (n >= BIGN && f->state==RD && !(f->flags&STRING))){
 				d=read(f->fd, s, n);
 				if(d<=0){
 					f->state=(d==0)?END:ERR;
diff --git a/sys/src/ape/lib/ap/stdio/fwrite.c b/sys/src/ape/lib/ap/stdio/fwrite.c
index c926dbf4d..4dc18d99e 100644
--- a/sys/src/ape/lib/ap/stdio/fwrite.c
+++ b/sys/src/ape/lib/ap/stdio/fwrite.c
@@ -20,7 +20,7 @@ size_t fwrite(const void *p, size_t recl, size_t nrec, FILE *f){
 			memcpy(f->wp, s, d);
 			f->wp+=d;
 		}else{
-			if(n>=BIGN && f->state==WR && !(f->flags&(STRING|LINEBUF)) && f->buf!=f->unbuf){
+			if(f->buf==f->unbuf || (n>=BIGN && f->state==WR && !(f->flags&(STRING|LINEBUF)))){
 				d=f->wp-f->buf;
 				if(d>0){
 					if(f->flags&APPEND)
@@ -38,12 +38,10 @@ size_t fwrite(const void *p, size_t recl, size_t nrec, FILE *f){
 					f->state=ERR;
 					goto ret;
 				}
-			}else{
-				if(f->flags&APPEND) lseek(f->fd, 0L, SEEK_END);
-				if((d=write(f->fd, s, n))<=0) {
-					f->state=ERR;
+			} else {
+				if(_IO_putc(*s, f)==EOF)
 					goto ret;
-				}
+				d=1;
 			}
 		}
 		s+=d;
diff --git a/sys/src/cmd/python/Python/import.c b/sys/src/cmd/python/Python/import.c
index 291e63dc7..5dfe52086 100644
--- a/sys/src/cmd/python/Python/import.c
+++ b/sys/src/cmd/python/Python/import.c
@@ -947,6 +947,8 @@ load_source_module(char *name, char *pathname, FILE *fp)
 		if (Py_VerboseFlag)
 			PySys_WriteStderr("import %s # from %s\n",
 				name, pathname);
+
+		if(0)	/* disabled this for now -- cinap */
 		if (cpathname)
 			write_compiled_module(co, cpathname, mtime);
 	}