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

merge

Browse source
This commit is contained in:
cinap_lenrek 2013-06-02 23:46:38 +02:00
commit bf2dd0c6bd
6 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.hgignore
View file

@ -6,7 +6,7 @@ syntax: regexp
^386/(9(pc|boot).*|pbs|mbr|init) ^386/(9(pc|boot).*|pbs|mbr|init)
^acme/bin/(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)(/|$) ^acme/bin/(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)(/|$)
^adm/(cache|keys|netkeys|secstore|users|whois|timezone/local)(/|$) ^adm/(cache|keys|netkeys|secstore|users|whois|timezone/local)(/|$)
^lib/(ndb|audio)(/|$) ^lib/(ndb|audio|firmware)(/|$)
^sys/doc/.*\.(html|ps|pdf|png|out)$ ^sys/doc/.*\.(html|ps|pdf|png|out)$
^sys/lib/(pkg|lp/log|man/lookman/index)(/|$) ^sys/lib/(pkg|lp/log|man/lookman/index)(/|$)
^sys/lib/python/.*\.(pyo|pyc|exe)$ ^sys/lib/python/.*\.(pyo|pyc|exe)$

2
sys/man/2/auth
View file

@ -44,7 +44,7 @@ void auth_freerpc(AuthRpc *rpc);
uint auth_rpc(AuthRpc *rpc, char *verb, void *a, int n); uint auth_rpc(AuthRpc *rpc, char *verb, void *a, int n);
.PP .PP
.B .B
int auth_getkey(char *proto, char *dom); int auth_getkey(char *params);
.PP .PP
.B .B
int (*amount_getkey)(char*, char*); int (*amount_getkey)(char*, char*);

2
sys/src/cmd/hjfs/fs2.c
View file

@ -723,8 +723,6 @@ chanwstat(Chan *ch, Dir *di)
if(di->length != d->size && !permcheck(ch->fs, d, ch->uid, OWRITE)) if(di->length != d->size && !permcheck(ch->fs, d, ch->uid, OWRITE))
goto perm; goto perm;
} }
if((ulong)~di->atime)
goto inval;
if((ulong)~di->mtime && !owner) if((ulong)~di->mtime && !owner)
goto perm; goto perm;
if((ulong)~di->mode && !owner) if((ulong)~di->mode && !owner)

2
sys/src/cmd/jpg/readgif.c
View file

@ -156,7 +156,7 @@ readarray(Header *h)
if(h->fields & 0x80) if(h->fields & 0x80)
h->globalcmap = readcmap(h, (h->fields&7)+1); h->globalcmap = readcmap(h, (h->fields&7)+1);
array = malloc(sizeof(Rawimage**)); array = malloc(sizeof(Rawimage*));
if(array == nil) if(array == nil)
giferror(h, memerr); giferror(h, memerr);
nimages = 0; nimages = 0;

2
sys/src/cmd/jpg/readjpg.c
View file

@ -247,7 +247,7 @@ Breadjpg(Biobuf *b, int colorspace)
} }
jpginit(); jpginit();
h = malloc(sizeof(Header)); h = malloc(sizeof(Header));
array = malloc(sizeof(Header)); array = malloc(2*sizeof(Rawimage*));
if(h==nil || array==nil){ if(h==nil || array==nil){
free(h); free(h);
free(array); free(array);

4
sys/src/cmd/jpg/readtga.c
View file

@ -404,12 +404,12 @@ Breadtga(Biobuf *bp)
} }
array = nil; array = nil;
if((ar = calloc(sizeof(Rawimage), 1)) == nil){ if((ar = calloc(1, sizeof(Rawimage))) == nil){
werrstr("ReadTGA: no memory - %r\n"); werrstr("ReadTGA: no memory - %r\n");
goto Error; goto Error;
} }
if((array = calloc(sizeof(Rawimage *), 2)) == nil){ if((array = calloc(2, sizeof(Rawimage *))) == nil){
werrstr("ReadTGA: no memory - %r\n"); werrstr("ReadTGA: no memory - %r\n");
goto Error; goto Error;
} }