Plan 9 from Bell Labs 2009-10-02

sys/src/cmd/jpg/readjpg.c

@@ -457,10 +457,12 @@ readsegment(Header *h, int *markerp)
 	n -= 2;
 	if(n > h->nbuf){
 		free(h->buf);
-		h->buf = jpgmalloc(h, n+1, 0); /* +1 for sentinel */
+		/* zero in case of short read later */
+		h->buf = jpgmalloc(h, n+1, 1); /* +1 for sentinel */
 		h->nbuf = n;
 	}
-	if(Bread(h->fd, h->buf, n) != n)
+	/* accept short reads to cope with some real-world jpegs */
+	if(Bread(h->fd, h->buf, n) < 0)
 		goto Readerr;
 	*markerp = m;
 	return n;

sys/src/libmemdraw/arctest.c

@@ -8,7 +8,6 @@ extern int drawdebug;
 void
 main(int argc, char **argv)
 {
-	char cc;
 	Memimage *x;
 	Point c = {208,871};
 	int a = 441;
@@ -21,6 +20,10 @@ main(int argc, char **argv)
 	int i, n;
 	vlong del;
 
+	if (argc != 2) {
+		fprint(2, "usage: arctest number\n");
+		exits("usage");
+	}
 	memimageinit();
 
 	x = allocmemimage(Rect(0,0,1000,1000), CMAP8);
@@ -53,7 +56,7 @@ iprint(char *fmt, ...)
 	char buf[1024];
 
 	va_start(va, fmt);
-	n = doprint(buf, buf+sizeof buf, fmt, va) - buf;
+	n = vseprint(buf, buf+sizeof buf, fmt, va) - buf;
 	va_end(va);
 
 	write(1,buf,n);

sys/src/libmemdraw/drawtest.c

@@ -62,7 +62,7 @@ iprint(char *fmt, ...)
 	char buf[1024];
 
 	va_start(va, fmt);
-	n = doprint(buf, buf+sizeof buf, fmt, va) - buf;
+	n = vseprint(buf, buf+sizeof buf, fmt, va) - buf;
 	va_end(va);
 
 	write(1,buf,n);
@@ -104,7 +104,7 @@ main(int argc, char *argv[])
 		exits("usage");
 	}
 
-	fmtinstall('b', numbconv);	/* binary! */
+//	fmtinstall('b', numbconv);	/* binary! */
 
 	fprint(2, "%s -x %d -y %d -s 0x%x %s %s %s\n", argv0, Xrange, Yrange, seed, dchan, schan, mchan);
 	srand(seed);

sys/src/libmemdraw/mkfile

@@ -36,7 +36,7 @@ $O.drawtime: drawtime.$O $LIB
 $O.drawtest: drawtest.$O $LIB
 	$LD -o $target $prereq
  
-$O.arctest: arctest.$O ndraw.$O arc.$O $LIB
+$O.arctest: arctest.$O draw.$O arc.$O $LIB
 	$LD -o $target $prereq
 
 $O.test: test.$O $LIB