Plan 9 from Bell Labs 2007-11-02

dist/replica/_plan9.db

@@ -1,8 +1,8 @@
 386 - 20000000775 sys sys 1010957353 0
-386/9load - 775 sys sys 1193687665 337132
-386/9loaddebug - 775 sys sys 1193687675 450713
-386/9loadlite - 775 sys sys 1193687678 160432
-386/9loadlitedebug - 775 sys sys 1193687682 236256
+386/9load - 775 sys sys 1193957727 337044
+386/9loaddebug - 775 sys sys 1193957738 450621
+386/9loadlite - 775 sys sys 1193957743 160348
+386/9loadlitedebug - 775 sys sys 1193957750 236164
 386/9pc - 775 sys sys 1192646200 2054406
 386/9pc.gz - 664 sys sys 1192646200 873537
 386/9pccpu - 775 sys sys 1191889923 1749481
@@ -11,7 +11,7 @@
 386/9pcdisk.gz - 664 sys sys 1192741561 973813
 386/9pcf - 775 sys sys 1191889940 2874011
 386/9pcf.gz - 664 sys sys 1191889940 1230163
-386/9pxeload - 775 sys sys 1193687689 337136
+386/9pxeload - 775 sys sys 1193957758 337052
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1168402260 116604
 386/bin/8c - 775 sys sys 1190520740 367214
@@ -7559,7 +7559,7 @@ sys/man/2/fd2path - 664 sys sys 957920009 1280
 sys/man/2/fgetc - 664 sys sys 1048637163 3983
 sys/man/2/flate - 664 sys sys 1018386775 4147
 sys/man/2/floor - 664 sys sys 944959697 737
-sys/man/2/fmtinstall - 664 sys sys 1034952837 7862
+sys/man/2/fmtinstall - 664 sys sys 1193939299 7941
 sys/man/2/fopen - 664 sys sys 1048637159 7770
 sys/man/2/fork - 664 sys sys 1018386775 3764
 sys/man/2/fprintf - 664 sys sys 1048637160 9726
@@ -9149,7 +9149,7 @@ sys/src/boot/pc/clock.c - 664 sys sys 1103641772 6425
 sys/src/boot/pc/conf.c - 664 sys sys 1094674484 10217
 sys/src/boot/pc/console.c - 664 sys sys 1094674483 3388
 sys/src/boot/pc/dat.h - 664 sys sys 1190921443 3637
-sys/src/boot/pc/devbios.c - 664 sys sys 1193607862 9299
+sys/src/boot/pc/devbios.c - 664 sys sys 1193956078 9172
 sys/src/boot/pc/devbios.h - 664 sys sys 1193167027 493
 sys/src/boot/pc/devfloppy.c - 664 sys sys 1032215913 15505
 sys/src/boot/pc/devfloppy.h - 664 sys sys 1032409559 4081
@@ -10087,7 +10087,7 @@ sys/src/cmd/cwfs/choline/mkfile - 664 sys sys 1171519759 26
 sys/src/cmd/cwfs/con.c - 664 sys sys 1174717615 15713
 sys/src/cmd/cwfs/config.c - 664 sys sys 1174717895 20243
 sys/src/cmd/cwfs/console.c - 664 sys sys 1174716894 4671
-sys/src/cmd/cwfs/cw.c - 664 sys sys 1190350112 42914
+sys/src/cmd/cwfs/cw.c - 664 sys sys 1193962091 42974
 sys/src/cmd/cwfs/cwfs - 20000000775 sys sys 1174799195 0
 sys/src/cmd/cwfs/cwfs/conf.c - 664 sys sys 1171485877 452
 sys/src/cmd/cwfs/cwfs/dat.h - 664 sys sys 1171485890 796
@@ -12606,7 +12606,7 @@ sys/src/cmd/jpg/bmp.c - 664 sys sys 1108852826 4222
 sys/src/cmd/jpg/bmp.h - 664 sys sys 1105455271 1034
 sys/src/cmd/jpg/close.c - 664 sys sys 944961292 1930
 sys/src/cmd/jpg/gif.c - 664 sys sys 1045505400 8844
-sys/src/cmd/jpg/ico.c - 664 sys sys 1143759343 8806
+sys/src/cmd/jpg/ico.c - 664 sys sys 1193938850 8874
 sys/src/cmd/jpg/imagefile.h - 664 sys sys 988225303 2246
 sys/src/cmd/jpg/jpegdump.c - 664 sys sys 1018802871 7161
 sys/src/cmd/jpg/jpg.c - 664 sys sys 1108938203 7411

dist/replica/plan9.db

@@ -1,8 +1,8 @@
 386 - 20000000775 sys sys 1010957353 0
-386/9load - 775 sys sys 1193687665 337132
-386/9loaddebug - 775 sys sys 1193687675 450713
-386/9loadlite - 775 sys sys 1193687678 160432
-386/9loadlitedebug - 775 sys sys 1193687682 236256
+386/9load - 775 sys sys 1193957727 337044
+386/9loaddebug - 775 sys sys 1193957738 450621
+386/9loadlite - 775 sys sys 1193957743 160348
+386/9loadlitedebug - 775 sys sys 1193957750 236164
 386/9pc - 775 sys sys 1192646200 2054406
 386/9pc.gz - 664 sys sys 1192646200 873537
 386/9pccpu - 775 sys sys 1191889923 1749481
@@ -11,7 +11,7 @@
 386/9pcdisk.gz - 664 sys sys 1192741561 973813
 386/9pcf - 775 sys sys 1191889940 2874011
 386/9pcf.gz - 664 sys sys 1191889940 1230163
-386/9pxeload - 775 sys sys 1193687689 337136
+386/9pxeload - 775 sys sys 1193957758 337052
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1168402260 116604
 386/bin/8c - 775 sys sys 1190520740 367214
@@ -7559,7 +7559,7 @@ sys/man/2/fd2path - 664 sys sys 957920009 1280
 sys/man/2/fgetc - 664 sys sys 1048637163 3983
 sys/man/2/flate - 664 sys sys 1018386775 4147
 sys/man/2/floor - 664 sys sys 944959697 737
-sys/man/2/fmtinstall - 664 sys sys 1034952837 7862
+sys/man/2/fmtinstall - 664 sys sys 1193939299 7941
 sys/man/2/fopen - 664 sys sys 1048637159 7770
 sys/man/2/fork - 664 sys sys 1018386775 3764
 sys/man/2/fprintf - 664 sys sys 1048637160 9726
@@ -9149,7 +9149,7 @@ sys/src/boot/pc/clock.c - 664 sys sys 1103641772 6425
 sys/src/boot/pc/conf.c - 664 sys sys 1094674484 10217
 sys/src/boot/pc/console.c - 664 sys sys 1094674483 3388
 sys/src/boot/pc/dat.h - 664 sys sys 1190921443 3637
-sys/src/boot/pc/devbios.c - 664 sys sys 1193607862 9299
+sys/src/boot/pc/devbios.c - 664 sys sys 1193956078 9172
 sys/src/boot/pc/devbios.h - 664 sys sys 1193167027 493
 sys/src/boot/pc/devfloppy.c - 664 sys sys 1032215913 15505
 sys/src/boot/pc/devfloppy.h - 664 sys sys 1032409559 4081
@@ -10087,7 +10087,7 @@ sys/src/cmd/cwfs/choline/mkfile - 664 sys sys 1171519759 26
 sys/src/cmd/cwfs/con.c - 664 sys sys 1174717615 15713
 sys/src/cmd/cwfs/config.c - 664 sys sys 1174717895 20243
 sys/src/cmd/cwfs/console.c - 664 sys sys 1174716894 4671
-sys/src/cmd/cwfs/cw.c - 664 sys sys 1190350112 42914
+sys/src/cmd/cwfs/cw.c - 664 sys sys 1193962091 42974
 sys/src/cmd/cwfs/cwfs - 20000000775 sys sys 1174799195 0
 sys/src/cmd/cwfs/cwfs/conf.c - 664 sys sys 1171485877 452
 sys/src/cmd/cwfs/cwfs/dat.h - 664 sys sys 1171485890 796
@@ -12606,7 +12606,7 @@ sys/src/cmd/jpg/bmp.c - 664 sys sys 1108852826 4222
 sys/src/cmd/jpg/bmp.h - 664 sys sys 1105455271 1034
 sys/src/cmd/jpg/close.c - 664 sys sys 944961292 1930
 sys/src/cmd/jpg/gif.c - 664 sys sys 1045505400 8844
-sys/src/cmd/jpg/ico.c - 664 sys sys 1143759343 8806
+sys/src/cmd/jpg/ico.c - 664 sys sys 1193938850 8874
 sys/src/cmd/jpg/imagefile.h - 664 sys sys 988225303 2246
 sys/src/cmd/jpg/jpegdump.c - 664 sys sys 1018802871 7161
 sys/src/cmd/jpg/jpg.c - 664 sys sys 1108938203 7411

dist/replica/plan9.log

@@ -53249,3 +53249,12 @@
 1193866205 1 c sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1193864518 383
 1193866205 2 c sys/man/4/usbdisk - 664 sys sys 1193865997 2801
 1193873404 0 c sys/src/9/ip/tcp.c - 664 sys sys 1193872007 65959
+1193940004 0 c sys/man/2/fmtinstall - 664 sys sys 1193939299 7941
+1193940004 1 c sys/src/cmd/jpg/ico.c - 664 sys sys 1193938850 8874
+1193956205 0 c sys/src/boot/pc/devbios.c - 664 sys sys 1193956078 9172
+1193958005 0 c 386/9load - 775 sys sys 1193957727 337044
+1193958005 1 c 386/9loaddebug - 775 sys sys 1193957738 450621
+1193958005 2 c 386/9loadlite - 775 sys sys 1193957743 160348
+1193958005 3 c 386/9loadlitedebug - 775 sys sys 1193957750 236164
+1193958005 4 c 386/9pxeload - 775 sys sys 1193957758 337052
+1193963405 0 c sys/src/cmd/cwfs/cw.c - 664 sys sys 1193962091 42974

sys/man/2/fmtinstall

@@ -24,7 +24,7 @@ struct Fmt{
 	int		prec;
 	ulong	flags;
 };
-
+.sp 0.3v
 enum{
 	FmtWidth	= 1,
 	FmtLeft		= FmtWidth << 1,
@@ -38,14 +38,14 @@ enum{
 	FmtLong		= FmtShort << 1,
 	FmtVLong	= FmtLong << 1,
 	FmtComma	= FmtVLong << 1,
-
+.sp 0.3v
 	FmtFlag		= FmtComma << 1
 };
 .fi
 .PP
 .B
 .ta \w'\fLchar* 'u
-
+.sp 0.3v
 .PP
 .B
 int	fmtfdinit(Fmt *f, int fd, char *buf, int nbuf);
@@ -64,7 +64,7 @@ int	runefmtstrinit(Fmt *f);
 .PP
 .B
 Rune*	runefmtstrflush(Fmt *f);
-
+.sp 0.3v
 .PP
 .B
 int	fmtinstall(int c, int (*fn)(Fmt*));
@@ -315,14 +315,15 @@ system calls to produce its output.
 .IP
 .EX
 .ta 6n +6n +6n +6n +6n +6n +6n +6n +6n
-#pragma	varargck	argpos	error	1
-
-void fatal(char *fmt, ...)
+#pragma	varargck	argpos	fatal	1
+.sp 0.3v
+void
+fatal(char *fmt, ...)
 {
 	Fmt f;
 	char buf[64];
 	va_list arg;
-
+.sp 0.3v
 	fmtfdinit(&f, 1, buf, sizeof buf);
 	fmtprint(&f, "fatal: ");
 	va_start(arg, fmt);
@@ -337,26 +338,25 @@ void fatal(char *fmt, ...)
 This example adds a verb to print complex numbers.
 .IP
 .EX
-typedef
-struct {
+typedef struct {
 	double	r, i;
 } Complex;
-
+.sp 0.3v
 #pragma	varargck	type	"X"	Complex
-
+.sp 0.3v
 int
 Xfmt(Fmt *f)
 {
 	Complex c;
-
+.sp 0.3v
 	c = va_arg(f->args, Complex);
 	return fmtprint(f, "(%g,%g)", c.r, c.i);
 }
-
+.sp 0.3v
 main(...)
 {
 	Complex x = (Complex){ 1.5, -2.3 };
-
+.sp 0.3v
 	fmtinstall('X', Xfmt);
 	print("x = %X\en", x);
 }
@@ -370,4 +370,3 @@ main(...)
 .SH DIAGNOSTICS
 These routines return negative numbers or nil for errors and set
 .IR errstr .
-.SH BUGS

sys/src/boot/pc/devbios.c

@@ -154,9 +154,9 @@ biosinit(void)
 	}
 	/*
 	 * bioses seem to only be able to read from drive number 0x80
-	 * and certainly can't read from the highest drive number, even if
-	 * there is only one.  attempting to read from the last drive number
-	 * yields a hung machine or a two-minute pause.
+	 * and certainly can't read from the highest drive number when we
+	 * call them, even if there is only one.  attempting to read from
+	 * the last drive number yields a hung machine or a two-minute pause.
 	 */
 	if (bdrive.ndevs > 0) {
 		if (bdrive.ndevs == 1)
@@ -269,13 +269,7 @@ islba(uchar drive)
 		print("islba: drive 0x%ux extensions version %d.%d cx 0x%lux\n",
 			drive, (uchar)(regs.ax >> 8),
 			(uchar)regs.ax, regs.cx); /* cx: 4=edd, 1=use dap */
-	if(!(regs.cx & 1)){
-		print("islba: drive 0x%ux: no dap bit in extensions cx\n",
-			drive);
-		return 0;
-	}
-//	dreset(drive);		/* pbslba does this, but it wedges here */
-	return 1;
+	return regs.cx & 1;		/* dap bit */
 }
 
 /*

sys/src/cmd/cwfs/cw.c

@@ -585,7 +585,10 @@ cwio(Device *dev, Off addr, void *buf, int opcode)
 			cw->cdev, (Wideoff)a1);
 		return Cerror;
 	}
-	a2 += c - b->entry;
+	if (oldcachefmt)
+		a2 += c - b->entry;
+	else
+		a2 += (c - b->entry) * h->msize;
 
 	state = c->state;
 	switch(opcode) {

sys/src/cmd/jpg/ico.c

@@ -439,7 +439,7 @@ main(int argc, char **argv)
 {
 	Biobuf in;
 	Icon *icon;
-	int fd;
+	int num, fd;
 	Rectangle r;
 	Event e;
 
@@ -474,10 +474,11 @@ main(int argc, char **argv)
 
 	einit(Emouse|Ekeyboard);
 
+	num = 0;
 	r.min = Pt(4, 4);
 	for(icon = h.first; icon != nil; icon = icon->next){
 		if(Bgeticon(&in, icon) < 0){
-			fprint(2, "bad rectangle: %r\n");
+			fprint(2, "%s: read fail: %r\n", argv0);
 			continue;
 		}
 		if(debug)
@@ -486,7 +487,11 @@ main(int argc, char **argv)
 		r.max = addpt(r.min, Pt(icon->w, icon->h));
 		icon->r = r;
 		r.min.x += r.max.x;
+		num++;
 	}
+
+	if(num == 0)
+		exits("no images");
 	eresized(0);
 
 	for(;;)