Plan 9 from Bell Labs 2006-03-07

dist/replica/_plan9.db

@@ -5747,7 +5747,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000664 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000664 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1140655027 257628
+sys/games/lib/fortunes - 664 sys sys 1141660932 257780
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -7749,7 +7749,7 @@ sys/man/8/udpecho - 664 sys sys 954305553 303
 sys/man/8/update - 664 sys sys 961259288 2336
 sys/man/8/venti - 664 sys sys 1069101926 5422
 sys/man/8/ventiaux - 664 sys sys 1063855987 10487
-sys/man/8/vga - 664 sys sys 1131301001 3864
+sys/man/8/vga - 664 sys sys 1141660952 3856
 sys/man/fonts - 664 sys sys 944959700 218
 sys/man/index.html - 664 sys sys 1019918444 1859
 sys/man/mkfile - 664 sys sys 1018974173 2264
@@ -13201,7 +13201,7 @@ sys/src/cmd/size.c - 664 sys sys 944961619 717
 sys/src/cmd/sleep.c - 664 sys sys 1126031186 170
 sys/src/cmd/snap - 20000000775 sys sys 951229639 0
 sys/src/cmd/snap/mkfile - 664 sys sys 1023834477 257
-sys/src/cmd/snap/read.c - 664 sys sys 1131659453 4287
+sys/src/cmd/snap/read.c - 664 sys sys 1141660969 4332
 sys/src/cmd/snap/snap.c - 664 sys sys 1014924727 1176
 sys/src/cmd/snap/snap.h - 664 sys sys 1131659453 985
 sys/src/cmd/snap/snapfs.c - 664 sys sys 1014924728 2932
@@ -13459,7 +13459,7 @@ sys/src/cmd/unix/drawterm/LICENSE - 664 sys sys 1135900534 12184
 sys/src/cmd/unix/drawterm/Make.config - 664 sys sys 1135900534 29
 sys/src/cmd/unix/drawterm/Make.irix - 664 sys sys 1137502401 493
 sys/src/cmd/unix/drawterm/Make.unix - 664 sys sys 1135900534 429
-sys/src/cmd/unix/drawterm/Make.win32 - 664 sys sys 1135900534 816
+sys/src/cmd/unix/drawterm/Make.win32 - 664 sys sys 1141662620 826
 sys/src/cmd/unix/drawterm/Makefile - 664 sys sys 1135900534 1112
 sys/src/cmd/unix/drawterm/README - 664 sys sys 1138469123 1002
 sys/src/cmd/unix/drawterm/args.h - 664 sys sys 1135900534 709
@@ -13481,7 +13481,7 @@ sys/src/cmd/unix/drawterm/gui-win32/alloc.c - 664 sys sys 1135900546 286
 sys/src/cmd/unix/drawterm/gui-win32/cload.c - 664 sys sys 1135900546 188
 sys/src/cmd/unix/drawterm/gui-win32/draw.c - 664 sys sys 1135900546 365
 sys/src/cmd/unix/drawterm/gui-win32/load.c - 664 sys sys 1135900546 186
-sys/src/cmd/unix/drawterm/gui-win32/screen.c - 664 sys sys 1135900547 11539
+sys/src/cmd/unix/drawterm/gui-win32/screen.c - 664 sys sys 1141662620 11653
 sys/src/cmd/unix/drawterm/gui-win32/wstrtoutf.c - 664 sys sys 1135900547 408
 sys/src/cmd/unix/drawterm/gui-x11 - 20000000775 sys sys 1135900548 0
 sys/src/cmd/unix/drawterm/gui-x11/Makefile - 664 sys sys 1135900547 207
@@ -14248,7 +14248,7 @@ sys/src/cmd/webfs/cookies.c - 664 sys sys 1128664611 21888
 sys/src/cmd/webfs/dat.h - 664 sys sys 1128664462 1621
 sys/src/cmd/webfs/fns.h - 664 sys sys 1032665987 1453
 sys/src/cmd/webfs/fs.c - 664 sys sys 1128664603 10944
-sys/src/cmd/webfs/http.c - 664 sys sys 1128666924 9396
+sys/src/cmd/webfs/http.c - 664 sys sys 1141662357 9487
 sys/src/cmd/webfs/io.c - 664 sys sys 1034736588 1384
 sys/src/cmd/webfs/main.c - 664 sys sys 1128664462 1083
 sys/src/cmd/webfs/mkfile - 664 sys sys 1032665986 340

dist/replica/plan9.db

@@ -5747,7 +5747,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000664 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000664 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1140655027 257628
+sys/games/lib/fortunes - 664 sys sys 1141660932 257780
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -7749,7 +7749,7 @@ sys/man/8/udpecho - 664 sys sys 954305553 303
 sys/man/8/update - 664 sys sys 961259288 2336
 sys/man/8/venti - 664 sys sys 1069101926 5422
 sys/man/8/ventiaux - 664 sys sys 1063855987 10487
-sys/man/8/vga - 664 sys sys 1131301001 3864
+sys/man/8/vga - 664 sys sys 1141660952 3856
 sys/man/fonts - 664 sys sys 944959700 218
 sys/man/index.html - 664 sys sys 1019918444 1859
 sys/man/mkfile - 664 sys sys 1018974173 2264
@@ -13201,7 +13201,7 @@ sys/src/cmd/size.c - 664 sys sys 944961619 717
 sys/src/cmd/sleep.c - 664 sys sys 1126031186 170
 sys/src/cmd/snap - 20000000775 sys sys 951229639 0
 sys/src/cmd/snap/mkfile - 664 sys sys 1023834477 257
-sys/src/cmd/snap/read.c - 664 sys sys 1131659453 4287
+sys/src/cmd/snap/read.c - 664 sys sys 1141660969 4332
 sys/src/cmd/snap/snap.c - 664 sys sys 1014924727 1176
 sys/src/cmd/snap/snap.h - 664 sys sys 1131659453 985
 sys/src/cmd/snap/snapfs.c - 664 sys sys 1014924728 2932
@@ -13459,7 +13459,7 @@ sys/src/cmd/unix/drawterm/LICENSE - 664 sys sys 1135900534 12184
 sys/src/cmd/unix/drawterm/Make.config - 664 sys sys 1135900534 29
 sys/src/cmd/unix/drawterm/Make.irix - 664 sys sys 1137502401 493
 sys/src/cmd/unix/drawterm/Make.unix - 664 sys sys 1135900534 429
-sys/src/cmd/unix/drawterm/Make.win32 - 664 sys sys 1135900534 816
+sys/src/cmd/unix/drawterm/Make.win32 - 664 sys sys 1141662620 826
 sys/src/cmd/unix/drawterm/Makefile - 664 sys sys 1135900534 1112
 sys/src/cmd/unix/drawterm/README - 664 sys sys 1138469123 1002
 sys/src/cmd/unix/drawterm/args.h - 664 sys sys 1135900534 709
@@ -13481,7 +13481,7 @@ sys/src/cmd/unix/drawterm/gui-win32/alloc.c - 664 sys sys 1135900546 286
 sys/src/cmd/unix/drawterm/gui-win32/cload.c - 664 sys sys 1135900546 188
 sys/src/cmd/unix/drawterm/gui-win32/draw.c - 664 sys sys 1135900546 365
 sys/src/cmd/unix/drawterm/gui-win32/load.c - 664 sys sys 1135900546 186
-sys/src/cmd/unix/drawterm/gui-win32/screen.c - 664 sys sys 1135900547 11539
+sys/src/cmd/unix/drawterm/gui-win32/screen.c - 664 sys sys 1141662620 11653
 sys/src/cmd/unix/drawterm/gui-win32/wstrtoutf.c - 664 sys sys 1135900547 408
 sys/src/cmd/unix/drawterm/gui-x11 - 20000000775 sys sys 1135900548 0
 sys/src/cmd/unix/drawterm/gui-x11/Makefile - 664 sys sys 1135900547 207
@@ -14248,7 +14248,7 @@ sys/src/cmd/webfs/cookies.c - 664 sys sys 1128664611 21888
 sys/src/cmd/webfs/dat.h - 664 sys sys 1128664462 1621
 sys/src/cmd/webfs/fns.h - 664 sys sys 1032665987 1453
 sys/src/cmd/webfs/fs.c - 664 sys sys 1128664603 10944
-sys/src/cmd/webfs/http.c - 664 sys sys 1128666924 9396
+sys/src/cmd/webfs/http.c - 664 sys sys 1141662357 9487
 sys/src/cmd/webfs/io.c - 664 sys sys 1034736588 1384
 sys/src/cmd/webfs/main.c - 664 sys sys 1128664462 1083
 sys/src/cmd/webfs/mkfile - 664 sys sys 1032665986 340

dist/replica/plan9.log

@@ -27946,3 +27946,9 @@
 1141592421 0 c sys/src/libmp/port/mptouv.c - 664 sys sys 1141591528 723
 1141617629 0 c 386/bin/aux/timesync - 775 sys sys 1141616696 128406
 1141617629 1 c 386/lib/libmp.a - 664 sys sys 1141616696 80024
+1141662642 0 c sys/games/lib/fortunes - 664 sys sys 1141660932 257780
+1141662642 1 c sys/man/8/vga - 664 sys sys 1141660952 3856
+1141662642 2 c sys/src/cmd/snap/read.c - 664 sys sys 1141660969 4332
+1141662642 3 c sys/src/cmd/webfs/http.c - 664 sys sys 1141662357 9487
+1141662642 4 c sys/src/cmd/unix/drawterm/Make.win32 - 664 sys sys 1141662620 826
+1141662642 5 c sys/src/cmd/unix/drawterm/gui-win32/screen.c - 664 sys sys 1141662620 11653

sys/games/lib/fortunes

@@ -4107,3 +4107,5 @@ cpu: can't dial: plan9.lanl.gov: The operation completed successfully.
 A kiss without a beard is like an egg without salt.  - Dutch proverb
 Nothing is good enough for the fortune file! - Dan Cross
 Tried to read 71776119061217303 bytes. Read only 23
+/dev/shm/root has gone 49710 days without being checked, check forced.
+x11 code is just so bad. by which i mean bad of course, and not good.  - forsyth

sys/man/8/vga

@@ -25,7 +25,7 @@ vga \- configure a VGA card
 ]
 ]
 .SH DESCRIPTION
-.B Aux/vga
+.I Vga
 configures a VGA controller for various display sizes and depths.
 Using the monitor type specified in
 .B /env/monitor
@@ -36,7 +36,7 @@ and the
 given as argument
 (default
 .BR 640x480x1 ), 
-.B aux/vga
+.I vga
 uses the database of known VGA controllers and monitors in
 .B /lib/vgadb
 (see

sys/src/cmd/snap/read.c

@@ -136,7 +136,7 @@ readseg(Seg **ps, Biobuf *b, Proc *plist)
 	Page **pp;
 	int i, npg;
 	int t;
-	int len;
+	int n, len;
 	ulong pid;
 	uvlong off;
 	char buf[Pagesize];
@@ -180,8 +180,8 @@ readseg(Seg **ps, Biobuf *b, Proc *plist)
 				fprint(2, "0x%.8llux same as %s pid %lud 0x%.8llux\n", s->offset+i*Pagesize, t=='m'?"mem":"text", pid, off);
 			break;
 		case 'r':
-			if(Bread(b, buf, len) != len)
-				panic("error reading segment xx");
+			if((n=Bread(b, buf, len)) != len)
+				sysfatal("short read of segment %d/%d at %llx: %r", n, len, Boffset(b));
 			pp[i] = datapage(buf, len);
 			if(debug)
 				fprint(2, "0x%.8llux is raw data\n", s->offset+i*Pagesize);

sys/src/cmd/unix/drawterm/Make.win32

@@ -10,7 +10,7 @@ CC=$(MING)gcc
 AS=$(MING)as
 RANLIB=$(MING)ranlib
 WINDRES=$(MING)windres
-CFLAGS=-Wall -Wno-missing-braces -I$(ROOT)/include -I$(ROOT) -I$(ROOT)/kern -c -D_X86_ -DIS_32 -DWINDOWS -O2
+CFLAGS=-Wall -Wno-missing-braces -I$(ROOT)/include -I$(ROOT) -I$(ROOT)/kern -c -D_X86_ -DIS_32 -DWINDOWS -DUNICODE -O2
 O=o
 FS=fs-win32
 IP=win32

sys/src/cmd/unix/drawterm/gui-win32/screen.c

@@ -1,3 +1,4 @@
+#define _WIN32_WINNT 0x0500
 #include	<windows.h>
 
 #undef Rectangle
@@ -188,13 +189,13 @@ winproc(void *a)
 	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wc.hbrBackground = GetStockObject(WHITE_BRUSH);
 	wc.lpszMenuName = 0;
-	wc.lpszClassName = "9pmgraphics";
+	wc.lpszClassName = L"9pmgraphics";
 	RegisterClass(&wc);
 
 	window = CreateWindowEx(
 		0,			/* extended style */
-		"9pmgraphics",		/* class */
-		"drawterm screen",		/* caption */
+		L"9pmgraphics",		/* class */
+		L"drawterm screen",		/* caption */
 		WS_OVERLAPPEDWINDOW,    /* style */
 		CW_USEDEFAULT,		/* init. x pos */
 		CW_USEDEFAULT,		/* init. y pos */
@@ -338,6 +339,11 @@ WindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 			return 1;
 		}
 		return DefWindowProc(hwnd, msg, wparam, lparam);
+	case WM_MOUSEWHEEL:
+		if ((int)(wparam & 0xFFFF0000)>0)
+			b|=8;
+		else
+			b|=16;
 	case WM_MOUSEMOVE:
 	case WM_LBUTTONUP:
 	case WM_MBUTTONUP:

sys/src/cmd/webfs/http.c

@@ -387,6 +387,10 @@ httpopen(Client *c, Url *url)
 		werrstr("Not found on server (404)");
 		goto Error;
 
+	case 405:	/* Method Not Allowed  */
+		werrstr("Method not allowed (405)");
+		goto Error;
+
 	case 407:	/* Proxy auth */
 		werrstr("Proxy authentication required (407)");
 		goto Error;