xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
cinap_lenrek 2011-05-10 05:33:43 +00:00
parent b73e068bfe
commit 3a78a07143
7 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rc/bin/inst/gui
View file

@ -1,7 +0,0 @@
#!/bin/rc
cd /bin/inst
echo blanktime 0 >/dev/vgactl
. defs
startwin 640 480

1
rc/bin/inst/textonly → rc/bin/inst/start
View file

@ -1,6 +1,5 @@
#!/bin/rc
# text-only install
cd /bin/inst
. defs

4
sys/lib/rootbind Executable file
View file

@ -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}

3
sys/man/8/cifsd
View file

@ -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

2
sys/src/ape/lib/ap/stdio/fread.c
View file

@ -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;

10
sys/src/ape/lib/ap/stdio/fwrite.c
View file

@ -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;

2
sys/src/cmd/python/Python/import.c
View file

@ -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);
}