Plan 9 from Bell Labs 2004-07-15

dist/replica/_plan9.db

@@ -6141,7 +6141,7 @@ sys/src/ape/lib/ap/plan9/umask.c - 664 sys sys 1014921985 182
 sys/src/ape/lib/ap/plan9/uname.c - 664 sys sys 1014921985 408
 sys/src/ape/lib/ap/plan9/unlink.c - 664 sys sys 1038237528 1505
 sys/src/ape/lib/ap/plan9/utime.c - 664 sys sys 1046643007 469
-sys/src/ape/lib/ap/plan9/wait.c - 664 sys sys 1088204173 2147
+sys/src/ape/lib/ap/plan9/wait.c - 664 sys sys 1089859817 2162
 sys/src/ape/lib/ap/plan9/write.c - 664 sys sys 1038237529 348
 sys/src/ape/lib/ap/posix - 20000000775 sys sys 1014921981 0
 sys/src/ape/lib/ap/posix/getgrent.c - 664 sys sys 1014921981 945
@@ -6489,7 +6489,7 @@ sys/src/boot/pc/fs.h - 664 sys sys 1032215924 627
 sys/src/boot/pc/ilock.c - 664 sys sys 1015007952 303
 sys/src/boot/pc/inflate.c - 664 sys sys 1021579984 2802
 sys/src/boot/pc/io.h - 664 sys sys 1015007952 5420
-sys/src/boot/pc/ip.h - 664 sys sys 1015007952 2434
+sys/src/boot/pc/ip.h - 664 sys sys 1089814405 2435
 sys/src/boot/pc/kbd.c - 664 sys sys 1015007952 10188
 sys/src/boot/pc/kfs.h - 664 sys sys 1032215924 861
 sys/src/boot/pc/kfsboot.c - 664 sys sys 1032215914 4788

dist/replica/plan9.db

@@ -6141,7 +6141,7 @@ sys/src/ape/lib/ap/plan9/umask.c - 664 sys sys 1014921985 182
 sys/src/ape/lib/ap/plan9/uname.c - 664 sys sys 1014921985 408
 sys/src/ape/lib/ap/plan9/unlink.c - 664 sys sys 1038237528 1505
 sys/src/ape/lib/ap/plan9/utime.c - 664 sys sys 1046643007 469
-sys/src/ape/lib/ap/plan9/wait.c - 664 sys sys 1088204173 2147
+sys/src/ape/lib/ap/plan9/wait.c - 664 sys sys 1089859817 2162
 sys/src/ape/lib/ap/plan9/write.c - 664 sys sys 1038237529 348
 sys/src/ape/lib/ap/posix - 20000000775 sys sys 1014921981 0
 sys/src/ape/lib/ap/posix/getgrent.c - 664 sys sys 1014921981 945
@@ -6489,7 +6489,7 @@ sys/src/boot/pc/fs.h - 664 sys sys 1032215924 627
 sys/src/boot/pc/ilock.c - 664 sys sys 1015007952 303
 sys/src/boot/pc/inflate.c - 664 sys sys 1021579984 2802
 sys/src/boot/pc/io.h - 664 sys sys 1015007952 5420
-sys/src/boot/pc/ip.h - 664 sys sys 1015007952 2434
+sys/src/boot/pc/ip.h - 664 sys sys 1089814405 2435
 sys/src/boot/pc/kbd.c - 664 sys sys 1015007952 10188
 sys/src/boot/pc/kfs.h - 664 sys sys 1032215924 861
 sys/src/boot/pc/kfsboot.c - 664 sys sys 1032215914 4788

dist/replica/plan9.log

@@ -16282,3 +16282,5 @@
 1089496876 0 c lib/vgadb - 664 sys sys 1089495677 28511
 1089739922 0 c sys/src/cmd/ip/mkfile - 664 sys sys 1089739069 1232
 1089739922 1 d sys/src/cmd/ip/bootp.h - 664 sys sys 944961013 0
+1089815416 0 c sys/src/boot/pc/ip.h - 664 sys sys 1089814405 2435
+1089860424 0 c sys/src/ape/lib/ap/plan9/wait.c - 664 sys sys 1089859817 2162

sys/src/ape/lib/ap/plan9/wait.c

@@ -89,7 +89,8 @@ wait4 (pid_t wpid, int *status, int options, Waitmsg *waitmsg) {
 		if (wpid <= 0) {
 			waitmsg = w;
 			wpid = w->pid;
-			*status = 0;
+			if(status)
+				*status = 0;
 			return wpid;
 		}
 		if (w->pid == wpid) {

sys/src/boot/pc/ip.h

@@ -77,7 +77,7 @@ struct Bootp
 	uchar	hlen;		/* hardware address len */
 	uchar	hops;		/* hops */
 	uchar	xid[4];		/* a random number */
-	uchar	secs[2];	/* elapsed snce client started booting */
+	uchar	secs[2];	/* elapsed since client started booting */
 	uchar	pad[2];
 	uchar	ciaddr[4];	/* client IP address (client tells server) */
 	uchar	yiaddr[4];	/* client IP address (server tells client) */