shithub: riscv

Info  •  Files  •  Log  •  Branches

merge

--- a/.hgignore

+++ b/.hgignore

@@ -6,7 +6,7 @@

 ^386/(9(pc|boot).*|pbs|mbr|init)

 ^acme/bin/(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)(/|$)

 ^adm/(cache|keys|netkeys|secstore|users|whois|timezone/local)(/|$)

-^lib/(ndb|audio)(/|$)

+^lib/(ndb|audio|firmware)(/|$)

 ^sys/doc/.*\.(html|ps|pdf|png|out)$

 ^sys/lib/(pkg|lp/log|man/lookman/index)(/|$)

 ^sys/lib/python/.*\.(pyo|pyc|exe)$

--- a/sys/man/2/auth

+++ b/sys/man/2/auth

@@ -44,7 +44,7 @@

 uint		auth_rpc(AuthRpc *rpc, char *verb, void *a, int n);

 .PP

 .B

-int		auth_getkey(char *proto, char *dom);

+int		auth_getkey(char *params);

 .PP

 .B

 int		(*amount_getkey)(char*, char*);

--- a/sys/src/cmd/hjfs/fs2.c

+++ b/sys/src/cmd/hjfs/fs2.c

@@ -723,8 +723,6 @@

 			if(di->length != d->size && !permcheck(ch->fs, d, ch->uid, OWRITE))

 				goto perm;

 	}

-	if((ulong)~di->atime)

-		goto inval;

 	if((ulong)~di->mtime && !owner)

 		goto perm;

 	if((ulong)~di->mode && !owner)

--- a/sys/src/cmd/jpg/readgif.c

+++ b/sys/src/cmd/jpg/readgif.c

@@ -156,7 +156,7 @@

 	if(h->fields & 0x80)

 		h->globalcmap = readcmap(h, (h->fields&7)+1);

-	array = malloc(sizeof(Rawimage**));

+	array = malloc(sizeof(Rawimage*));

 	if(array == nil)

 		giferror(h, memerr);

 	nimages = 0;

--- a/sys/src/cmd/jpg/readjpg.c

+++ b/sys/src/cmd/jpg/readjpg.c

@@ -247,7 +247,7 @@

 	}

 	jpginit();

 	h = malloc(sizeof(Header));

-	array = malloc(sizeof(Header));

+	array = malloc(2*sizeof(Rawimage*));

 	if(h==nil || array==nil){

 		free(h);

 		free(array);

--- a/sys/src/cmd/jpg/readtga.c

+++ b/sys/src/cmd/jpg/readtga.c

@@ -404,12 +404,12 @@

 	}

 	array = nil;

-	if((ar = calloc(sizeof(Rawimage), 1)) == nil){

+	if((ar = calloc(1, sizeof(Rawimage))) == nil){

 		werrstr("ReadTGA: no memory - %r\n");

 		goto Error;

 	}

-	if((array = calloc(sizeof(Rawimage *), 2)) == nil){

+	if((array = calloc(2, sizeof(Rawimage *))) == nil){

 		werrstr("ReadTGA: no memory - %r\n");

 		goto Error;

 	}