Browse Source

Plan 9 from Bell Labs 2006-10-30

David du Colombier 14 years ago
parent
commit
ca966ae743

+ 13 - 13
dist/replica/_plan9.db

@@ -1313,7 +1313,7 @@ lib/face/48x48x4/f - 20000000775 sys sys 944945448 0
 lib/face/48x48x4/f/freund.1 - 664 sys sys 944941891 1028
 lib/face/48x48x4/f/ftg.1 - 664 sys sys 944941891 919
 lib/face/48x48x4/g - 20000000775 sys sys 944941892 0
-lib/face/48x48x4/g/geoff.1 - 664 sys sys 1140277644 1168
+lib/face/48x48x4/g/geoff.1 - 664 sys sys 1162105947 1034
 lib/face/48x48x4/g/george.1 - 664 sys sys 944941892 1100
 lib/face/48x48x4/g/gerard.1 - 664 sys sys 944941892 1088
 lib/face/48x48x4/g/ghost.1 - 664 sys sys 944941892 783
@@ -1395,7 +1395,7 @@ lib/face/48x48x4/x/xigh.1 - 664 sys sys 1142019024 1204
 lib/face/48x48x4/y - 20000000775 sys sys 944941894 0
 lib/face/48x48x4/z - 20000000775 sys sys 944941894 0
 lib/face/48x48x8 - 20000000775 sys sys 944941834 0
-lib/face/48x48x8/.dict - 664 sys sys 1161061288 2767
+lib/face/48x48x8/.dict - 664 sys sys 1162138215 2800
 lib/face/48x48x8/Z - 20000000775 sys sys 944941832 0
 lib/face/48x48x8/a - 20000000775 sys sys 944941832 0
 lib/face/48x48x8/a/axel.1 - 664 sys sys 1056983599 473
@@ -5457,7 +5457,7 @@ rc/bin/label - 775 sys sys 945617207 34
 rc/bin/lc - 775 sys sys 945617207 24
 rc/bin/leak - 775 sys sys 1139744263 1052
 rc/bin/lookman - 775 sys sys 1017679344 686
-rc/bin/lp - 775 sys sys 1146317617 5154
+rc/bin/lp - 775 sys sys 1162105982 5201
 rc/bin/mail - 775 sys sys 1045504003 138
 rc/bin/man - 775 sys sys 1155361978 2516
 rc/bin/map - 775 sys sys 945617207 1576
@@ -7404,7 +7404,7 @@ sys/man/1/tweak - 664 sys sys 957920008 4762
 sys/man/1/uniq - 664 sys sys 944959674 995
 sys/man/1/units - 664 sys sys 1113743326 2046
 sys/man/1/uptime - 664 sys sys 1074733782 380
-sys/man/1/vac - 664 sys sys 1158391232 3228
+sys/man/1/vac - 664 sys sys 1162102172 3244
 sys/man/1/vi - 664 sys sys 1101668051 2904
 sys/man/1/vnc - 664 sys sys 1158063994 4313
 sys/man/1/vt - 664 sys sys 1133880370 2256
@@ -7429,7 +7429,7 @@ sys/man/2/addpt - 664 sys sys 958249501 2964
 sys/man/2/aes - 664 sys sys 1032058672 997
 sys/man/2/allocimage - 664 sys sys 1046787977 7304
 sys/man/2/arg - 664 sys sys 1139744263 2184
-sys/man/2/arith3 - 664 sys sys 969499887 4397
+sys/man/2/arith3 - 664 sys sys 1162102967 4393
 sys/man/2/assert - 664 sys sys 1102868467 377
 sys/man/2/atof - 664 sys sys 1155361945 2777
 sys/man/2/auth - 664 sys sys 1017423719 7539
@@ -7488,12 +7488,12 @@ sys/man/2/getuser - 664 sys sys 1016466457 641
 sys/man/2/getwd - 664 sys sys 971455511 701
 sys/man/2/graphics - 664 sys sys 1140900146 12765
 sys/man/2/html - 664 sys sys 1019828742 29269
-sys/man/2/httpd - 664 sys sys 1032633536 5941
+sys/man/2/httpd - 664 sys sys 1162102159 5919
 sys/man/2/hypot - 664 sys sys 944959693 302
 sys/man/2/intmap - 664 sys sys 1015091523 2622
 sys/man/2/ioproc - 664 sys sys 1159419768 3060
 sys/man/2/iounit - 664 sys sys 1015091523 1001
-sys/man/2/ip - 664 sys sys 1156429262 7197
+sys/man/2/ip - 664 sys sys 1162102153 7209
 sys/man/2/isalpharune - 664 sys sys 1015091523 1059
 sys/man/2/keyboard - 664 sys sys 950892860 2065
 sys/man/2/lock - 664 sys sys 1048643958 4692
@@ -7515,7 +7515,7 @@ sys/man/2/open - 664 sys sys 1015091524 3404
 sys/man/2/perror - 664 sys sys 944959696 1881
 sys/man/2/pipe - 664 sys sys 950892864 1587
 sys/man/2/plumb - 664 sys sys 1015091524 4816
-sys/man/2/pool - 664 sys sys 1102093086 8574
+sys/man/2/pool - 664 sys sys 1162102403 8574
 sys/man/2/postnote - 664 sys sys 944959695 790
 sys/man/2/prime - 664 sys sys 1063855709 1962
 sys/man/2/print - 664 sys sys 1115941566 8852
@@ -7523,9 +7523,9 @@ sys/man/2/privalloc - 664 sys sys 984709633 651
 sys/man/2/proto - 664 sys sys 969499889 2948
 sys/man/2/pushssl - 664 sys sys 958249503 1032
 sys/man/2/pushtls - 664 sys sys 1124711123 5618
-sys/man/2/qball - 664 sys sys 950892866 2000
+sys/man/2/qball - 664 sys sys 1162102671 1996
 sys/man/2/qsort - 664 sys sys 944959694 763
-sys/man/2/quaternion - 664 sys sys 950892867 3421
+sys/man/2/quaternion - 664 sys sys 1162102619 3417
 sys/man/2/quote - 664 sys sys 1067719062 3072
 sys/man/2/rand - 664 sys sys 1035836606 2881
 sys/man/2/rc4 - 664 sys sys 1032058674 1138
@@ -7977,7 +7977,7 @@ sys/src/9/pc/ether589.c - 664 sys sys 1015014516 4644
 sys/src/9/pc/ether79c970.c - 664 sys sys 1160070602 14088
 sys/src/9/pc/ether8003.c - 664 sys sys 1015014516 6665
 sys/src/9/pc/ether8139.c - 664 sys sys 1160066369 18561
-sys/src/9/pc/ether8169.c - 664 sys sys 1160066369 25393
+sys/src/9/pc/ether8169.c - 664 sys sys 1162138241 25392
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1131290377 32294
 sys/src/9/pc/ether82557.c - 664 sys sys 1153082663 30197
 sys/src/9/pc/ether83815.c - 664 sys sys 1140271743 26125
@@ -8165,7 +8165,7 @@ sys/src/9/port/thwack.c - 664 sys sys 1057323394 7253
 sys/src/9/port/thwack.h - 664 sys sys 1015278340 1792
 sys/src/9/port/tod.c - 664 sys sys 1146746630 5377
 sys/src/9/port/unthwack.c - 664 sys sys 1057323394 5249
-sys/src/9/port/xalloc.c - 664 sys sys 1131290051 4063
+sys/src/9/port/xalloc.c - 664 sys sys 1162138307 4277
 sys/src/9/ppc - 20000000775 sys sys 1059490838 0
 sys/src/9/ppc/blast - 664 sys sys 1107436310 670
 sys/src/9/ppc/blast.h - 664 sys sys 1059490750 3109
@@ -12552,7 +12552,7 @@ sys/src/cmd/look.c - 664 sys sys 944961619 5994
 sys/src/cmd/lp - 20000000775 sys sys 953344617 0
 sys/src/cmd/lp/LOCK.c - 664 sys sys 1015090023 1066
 sys/src/cmd/lp/ipcopen.c - 664 sys sys 944961017 1607
-sys/src/cmd/lp/lp.rc - 775 sys sys 1146317617 5154
+sys/src/cmd/lp/lp.rc - 775 sys sys 1162105978 5201
 sys/src/cmd/lp/lpdaemon.c - 664 sys sys 1032060412 10000
 sys/src/cmd/lp/lpdsend.c - 664 sys sys 1116770113 9583
 sys/src/cmd/lp/lpsend.c - 664 sys sys 1015090024 6180

+ 13 - 13
dist/replica/plan9.db

@@ -1313,7 +1313,7 @@ lib/face/48x48x4/f - 20000000775 sys sys 944945448 0
 lib/face/48x48x4/f/freund.1 - 664 sys sys 944941891 1028
 lib/face/48x48x4/f/ftg.1 - 664 sys sys 944941891 919
 lib/face/48x48x4/g - 20000000775 sys sys 944941892 0
-lib/face/48x48x4/g/geoff.1 - 664 sys sys 1140277644 1168
+lib/face/48x48x4/g/geoff.1 - 664 sys sys 1162105947 1034
 lib/face/48x48x4/g/george.1 - 664 sys sys 944941892 1100
 lib/face/48x48x4/g/gerard.1 - 664 sys sys 944941892 1088
 lib/face/48x48x4/g/ghost.1 - 664 sys sys 944941892 783
@@ -1395,7 +1395,7 @@ lib/face/48x48x4/x/xigh.1 - 664 sys sys 1142019024 1204
 lib/face/48x48x4/y - 20000000775 sys sys 944941894 0
 lib/face/48x48x4/z - 20000000775 sys sys 944941894 0
 lib/face/48x48x8 - 20000000775 sys sys 944941834 0
-lib/face/48x48x8/.dict - 664 sys sys 1161061288 2767
+lib/face/48x48x8/.dict - 664 sys sys 1162138215 2800
 lib/face/48x48x8/Z - 20000000775 sys sys 944941832 0
 lib/face/48x48x8/a - 20000000775 sys sys 944941832 0
 lib/face/48x48x8/a/axel.1 - 664 sys sys 1056983599 473
@@ -5457,7 +5457,7 @@ rc/bin/label - 775 sys sys 945617207 34
 rc/bin/lc - 775 sys sys 945617207 24
 rc/bin/leak - 775 sys sys 1139744263 1052
 rc/bin/lookman - 775 sys sys 1017679344 686
-rc/bin/lp - 775 sys sys 1146317617 5154
+rc/bin/lp - 775 sys sys 1162105982 5201
 rc/bin/mail - 775 sys sys 1045504003 138
 rc/bin/man - 775 sys sys 1155361978 2516
 rc/bin/map - 775 sys sys 945617207 1576
@@ -7404,7 +7404,7 @@ sys/man/1/tweak - 664 sys sys 957920008 4762
 sys/man/1/uniq - 664 sys sys 944959674 995
 sys/man/1/units - 664 sys sys 1113743326 2046
 sys/man/1/uptime - 664 sys sys 1074733782 380
-sys/man/1/vac - 664 sys sys 1158391232 3228
+sys/man/1/vac - 664 sys sys 1162102172 3244
 sys/man/1/vi - 664 sys sys 1101668051 2904
 sys/man/1/vnc - 664 sys sys 1158063994 4313
 sys/man/1/vt - 664 sys sys 1133880370 2256
@@ -7429,7 +7429,7 @@ sys/man/2/addpt - 664 sys sys 958249501 2964
 sys/man/2/aes - 664 sys sys 1032058672 997
 sys/man/2/allocimage - 664 sys sys 1046787977 7304
 sys/man/2/arg - 664 sys sys 1139744263 2184
-sys/man/2/arith3 - 664 sys sys 969499887 4397
+sys/man/2/arith3 - 664 sys sys 1162102967 4393
 sys/man/2/assert - 664 sys sys 1102868467 377
 sys/man/2/atof - 664 sys sys 1155361945 2777
 sys/man/2/auth - 664 sys sys 1017423719 7539
@@ -7488,12 +7488,12 @@ sys/man/2/getuser - 664 sys sys 1016466457 641
 sys/man/2/getwd - 664 sys sys 971455511 701
 sys/man/2/graphics - 664 sys sys 1140900146 12765
 sys/man/2/html - 664 sys sys 1019828742 29269
-sys/man/2/httpd - 664 sys sys 1032633536 5941
+sys/man/2/httpd - 664 sys sys 1162102159 5919
 sys/man/2/hypot - 664 sys sys 944959693 302
 sys/man/2/intmap - 664 sys sys 1015091523 2622
 sys/man/2/ioproc - 664 sys sys 1159419768 3060
 sys/man/2/iounit - 664 sys sys 1015091523 1001
-sys/man/2/ip - 664 sys sys 1156429262 7197
+sys/man/2/ip - 664 sys sys 1162102153 7209
 sys/man/2/isalpharune - 664 sys sys 1015091523 1059
 sys/man/2/keyboard - 664 sys sys 950892860 2065
 sys/man/2/lock - 664 sys sys 1048643958 4692
@@ -7515,7 +7515,7 @@ sys/man/2/open - 664 sys sys 1015091524 3404
 sys/man/2/perror - 664 sys sys 944959696 1881
 sys/man/2/pipe - 664 sys sys 950892864 1587
 sys/man/2/plumb - 664 sys sys 1015091524 4816
-sys/man/2/pool - 664 sys sys 1102093086 8574
+sys/man/2/pool - 664 sys sys 1162102403 8574
 sys/man/2/postnote - 664 sys sys 944959695 790
 sys/man/2/prime - 664 sys sys 1063855709 1962
 sys/man/2/print - 664 sys sys 1115941566 8852
@@ -7523,9 +7523,9 @@ sys/man/2/privalloc - 664 sys sys 984709633 651
 sys/man/2/proto - 664 sys sys 969499889 2948
 sys/man/2/pushssl - 664 sys sys 958249503 1032
 sys/man/2/pushtls - 664 sys sys 1124711123 5618
-sys/man/2/qball - 664 sys sys 950892866 2000
+sys/man/2/qball - 664 sys sys 1162102671 1996
 sys/man/2/qsort - 664 sys sys 944959694 763
-sys/man/2/quaternion - 664 sys sys 950892867 3421
+sys/man/2/quaternion - 664 sys sys 1162102619 3417
 sys/man/2/quote - 664 sys sys 1067719062 3072
 sys/man/2/rand - 664 sys sys 1035836606 2881
 sys/man/2/rc4 - 664 sys sys 1032058674 1138
@@ -7977,7 +7977,7 @@ sys/src/9/pc/ether589.c - 664 sys sys 1015014516 4644
 sys/src/9/pc/ether79c970.c - 664 sys sys 1160070602 14088
 sys/src/9/pc/ether8003.c - 664 sys sys 1015014516 6665
 sys/src/9/pc/ether8139.c - 664 sys sys 1160066369 18561
-sys/src/9/pc/ether8169.c - 664 sys sys 1160066369 25393
+sys/src/9/pc/ether8169.c - 664 sys sys 1162138241 25392
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1131290377 32294
 sys/src/9/pc/ether82557.c - 664 sys sys 1153082663 30197
 sys/src/9/pc/ether83815.c - 664 sys sys 1140271743 26125
@@ -8165,7 +8165,7 @@ sys/src/9/port/thwack.c - 664 sys sys 1057323394 7253
 sys/src/9/port/thwack.h - 664 sys sys 1015278340 1792
 sys/src/9/port/tod.c - 664 sys sys 1146746630 5377
 sys/src/9/port/unthwack.c - 664 sys sys 1057323394 5249
-sys/src/9/port/xalloc.c - 664 sys sys 1131290051 4063
+sys/src/9/port/xalloc.c - 664 sys sys 1162138307 4277
 sys/src/9/ppc - 20000000775 sys sys 1059490838 0
 sys/src/9/ppc/blast - 664 sys sys 1107436310 670
 sys/src/9/ppc/blast.h - 664 sys sys 1059490750 3109
@@ -12552,7 +12552,7 @@ sys/src/cmd/look.c - 664 sys sys 944961619 5994
 sys/src/cmd/lp - 20000000775 sys sys 953344617 0
 sys/src/cmd/lp/LOCK.c - 664 sys sys 1015090023 1066
 sys/src/cmd/lp/ipcopen.c - 664 sys sys 944961017 1607
-sys/src/cmd/lp/lp.rc - 775 sys sys 1146317617 5154
+sys/src/cmd/lp/lp.rc - 775 sys sys 1162105978 5201
 sys/src/cmd/lp/lpdaemon.c - 664 sys sys 1032060412 10000
 sys/src/cmd/lp/lpdsend.c - 664 sys sys 1116770113 9583
 sys/src/cmd/lp/lpsend.c - 664 sys sys 1015090024 6180

+ 13 - 0
dist/replica/plan9.log

@@ -31624,3 +31624,16 @@
 1161604806 0 c sys/games/lib/fortunes - 664 sys sys 1161603592 261218
 1161745207 0 c 386/bin/upas/smtpd - 775 sys sys 1161745025 332398
 1161910806 0 c sys/src/cmd/7l/obj.c - 774 sys sys 1161910512 22824
+1162103405 0 c sys/man/1/vac - 664 sys sys 1162102172 3244
+1162103405 1 c sys/man/2/ip - 664 sys sys 1162102153 7209
+1162103405 2 c sys/man/2/arith3 - 664 sys sys 1162102967 4393
+1162103405 3 c sys/man/2/httpd - 664 sys sys 1162102159 5919
+1162103405 4 c sys/man/2/pool - 664 sys sys 1162102403 8574
+1162103405 5 c sys/man/2/qball - 664 sys sys 1162102671 1996
+1162103405 6 c sys/man/2/quaternion - 664 sys sys 1162102619 3417
+1162107006 0 c lib/face/48x48x4/g/geoff.1 - 664 sys sys 1162105947 1034
+1162107006 1 c rc/bin/lp - 775 sys sys 1162105982 5201
+1162107006 2 c sys/src/cmd/lp/lp.rc - 775 sys sys 1162105978 5201
+1162139406 0 c lib/face/48x48x8/.dict - 664 sys sys 1162138215 2800
+1162139406 1 c sys/src/9/pc/ether8169.c - 664 sys sys 1162138241 25392
+1162139406 2 c sys/src/9/port/xalloc.c - 664 sys sys 1162138307 4277

BIN
lib/face/48x48x4/g/geoff.1


+ 1 - 0
lib/face/48x48x8/.dict

@@ -22,6 +22,7 @@ chunder.com/brucee b/brucee.1
 cl/unknown u/unknown.cl
 cn/unknown u/unknown.cn
 comcast.net/unknown c/comcast.1
+coraid.com/quanstro q/quanstro.1
 cr/unknown u/unknown.cr
 cwru.edu/noah.evans n/noah.1
 cz/unknown u/unknown.cz

+ 3 - 2
rc/bin/lp

@@ -99,8 +99,8 @@ if(! ifs=() eval `{aux/getflags $*}) {
 	exit usage
 }
 if(~ $flagd '?'){
-	awk 'BEGIN{printf "device       location  host                 class\n"}
-			/^[^#]/	{printf "%-12s %-9s %-20s %s\n", $1, $2, $3, $6 }' $LPLIB/devices
+	awk 'BEGIN {print "device       location  host                   class"}
+/^[^#]/	{ printf "%-12s %-9s %-22s %s\n", $1, $2, $3, $6 }' $LPLIB/devices
 	exit
 }
 if(~ $flagp '?'){
@@ -157,6 +157,7 @@ STAT=$LPDLINE(9)
 KILL=$LPDLINE(10)
 DAEMON=$LPDLINE(11)
 SCHED=$LPDLINE(12)
+if (~ $#SCHED 0) SCHED=FIFO	# everyone uses FIFO
 if (~ $KILLFLAG 1)
 	switch ($KILL) {
 	case -;	echo kill option not available on $LPDEST >[1=2]

+ 1 - 1
sys/man/1/vac

@@ -69,7 +69,7 @@ of 512 bytes to 52k.
 Reduce the number of blocks written to Venti by comparing the files to be stored with
 the contents of an existing
 .I vac
-file tree given by
+file tree whose score is stored in
 .IR oldvacfile .
 .TP
 .BI -e " exclude

+ 1 - 2
sys/man/2/arith3

@@ -2,10 +2,9 @@
 .SH NAME
 add3, sub3, neg3, div3, mul3, eqpt3, closept3, dot3, cross3, len3, dist3, unit3, midpt3, lerp3, reflect3, nearseg3, pldist3, vdiv3, vrem3, pn2f3, ppp2f3, fff2p3, pdiv4, add4, sub4 \- operations on 3-d points and planes
 .SH SYNOPSIS
-.PP
 .B
 #include <draw.h>
-.PP
+.br
 .B
 #include <geometry.h>
 .PP

+ 0 - 2
sys/man/2/httpd

@@ -61,8 +61,6 @@ hxferenc,
 .SH SYNOPSIS
 .nf
 .B #include <u.h>
-.nf
-.B #include <u.h>
 .B #include <libc.h>
 .B #include <httpd.h>
 .PP

+ 3 - 0
sys/man/2/ip

@@ -320,6 +320,8 @@ struct Iplifc
 .PP
 .I Ipv6rp
 is:
+.PP
+.EX
 struct Ipv6rp
 {
 	int	mflag;
@@ -332,6 +334,7 @@ struct Ipv6rp
 	int	ttl;
 	int	routerlt;	
 };
+.EE
 .PP
 .I Dev
 contains the first 64 bytes of the device configured with this

+ 3 - 3
sys/man/2/pool

@@ -4,9 +4,9 @@ poolalloc, poolallocalignspan, poolfree, poolmsize, poolrealloc, poolcompact, po
 pooldump \- general memory management routines
 .SH SYNOPSIS
 .B #include <u.h>
-.PP
+.br
 .B #include <libc.h>
-.PP
+.br
 .B #include <pool.h>
 .PP
 .B
@@ -36,7 +36,7 @@ void	poolcheck(Pool *pool)
 void	poolblockcheck(Pool *pool, void *ptr)
 .PP
 .B
-void pooldump(Pool *pool);
+void	pooldump(Pool *pool);
 .SH DESCRIPTION
 These routines provide a general memory management facility.
 Memory is retrieved from a coarser allocator (e.g. 

+ 1 - 2
sys/man/2/qball

@@ -2,10 +2,9 @@
 .SH NAME
 qball \- 3-d rotation controller
 .SH SYNOPSIS
-.PP
 .B
 #include <draw.h>
-.PP
+.br
 .B
 #include <geometry.h>
 .PP

+ 1 - 2
sys/man/2/quaternion

@@ -2,10 +2,9 @@
 .SH NAME
 qtom, mtoq, qadd, qsub, qneg, qmul, qdiv, qunit, qinv, qlen, slerp, qmid, qsqrt \- Quaternion arithmetic
 .SH SYNOPSIS
-.PP
 .B
 #include <draw.h>
-.PP
+.br
 .B
 #include <geometry.h>
 .PP

+ 1 - 1
sys/src/9/pc/ether8169.c

@@ -237,7 +237,7 @@ struct Dtcc {
 
 enum {						/* Variants */
 	Rtl8100e	= (0x8136<<16)|0x10EC,	/* RTL810[01]E ? */
-	Rtl8169c		= (0x0116<<16)|0x16EC,	/* RTL8169C+ (USR997902) */
+	Rtl8169c	= (0x0116<<16)|0x16EC,	/* RTL8169C+ (USR997902) */
 	Rtl8169sc	= (0x8167<<16)|0x10EC,	/* RTL8169SC */
 	Rtl8168b	= (0x8168<<16)|0x10EC,	/* RTL8168B */
 	Rtl8169		= (0x8169<<16)|0x10EC,	/* RTL8169 */

+ 12 - 9
sys/src/9/port/xalloc.c

@@ -4,8 +4,6 @@
 #include "dat.h"
 #include "fns.h"
 
-#define datoff		((ulong)((Xhdr*)0)->data)
-
 enum
 {
 	Chunk		= 64*1024,
@@ -29,7 +27,7 @@ struct Xhdr
 {
 	ulong	size;
 	ulong	magix;
-	char	data[1];
+	char	data[];
 };
 
 struct Xalloc
@@ -123,7 +121,7 @@ xallocz(ulong size, int zero)
 	Xhdr *p;
 	Hole *h, **l;
 
-	size += BY2V + sizeof(Xhdr);
+	size += BY2V + offsetof(Xhdr, data[0]);
 	size &= ~(BY2V-1);
 
 	ilock(&xlists);
@@ -162,10 +160,10 @@ xfree(void *p)
 {
 	Xhdr *x;
 
-	x = (Xhdr*)((ulong)p - datoff);
+	x = (Xhdr*)((ulong)p - offsetof(Xhdr, data[0]));
 	if(x->magix != Magichole) {
 		xsummary();
-		panic("xfree(0x%lux) 0x%lux!=0x%lux", p, (ulong)Magichole, x->magix);
+		panic("xfree(%#p) %#ux != %#lux", p, Magichole, x->magix);
 	}
 	xhole(PADDR(x), x->size);
 }
@@ -175,9 +173,14 @@ xmerge(void *vp, void *vq)
 {
 	Xhdr *p, *q;
 
-	p = vp;
-	if((uchar*)vp+p->size == (uchar*)vq) {
-		q = vq;
+	p = (Xhdr*)(((ulong)vp - offsetof(Xhdr, data[0])));
+	q = (Xhdr*)(((ulong)vq - offsetof(Xhdr, data[0])));
+	if(p->magix != Magichole || q->magix != Magichole) {
+		xsummary();
+		panic("xmerge(%#p, %#p) bad magic %#lux, %#lux\n",
+			vp, vq, p->magix, q->magix);
+	}
+	if((uchar*)p+p->size == (uchar*)q) {
 		p->size += q->size;
 		return 1;
 	}

+ 3 - 2
sys/src/cmd/lp/lp.rc

@@ -99,8 +99,8 @@ if(! ifs=() eval `{aux/getflags $*}) {
 	exit usage
 }
 if(~ $flagd '?'){
-	awk 'BEGIN{printf "device       location  host                 class\n"}
-			/^[^#]/	{printf "%-12s %-9s %-20s %s\n", $1, $2, $3, $6 }' $LPLIB/devices
+	awk 'BEGIN {print "device       location  host                   class"}
+/^[^#]/	{ printf "%-12s %-9s %-22s %s\n", $1, $2, $3, $6 }' $LPLIB/devices
 	exit
 }
 if(~ $flagp '?'){
@@ -157,6 +157,7 @@ STAT=$LPDLINE(9)
 KILL=$LPDLINE(10)
 DAEMON=$LPDLINE(11)
 SCHED=$LPDLINE(12)
+if (~ $#SCHED 0) SCHED=FIFO	# everyone uses FIFO
 if (~ $KILLFLAG 1)
 	switch ($KILL) {
 	case -;	echo kill option not available on $LPDEST >[1=2]