Plan 9 from Bell Labs 2011-07-26

lib/ndb/common

@@ -294,6 +294,7 @@ udp=tacacs port=49
 udp=tftp port=69
 udp=bootpc port=68
 udp=bootp port=67
+udp=bootps port=67
 udp=domain port=53
 udp=dns port=53
 udp=portmap port=111

sys/include/libc.h

@@ -177,16 +177,23 @@ extern	Rune*	runefmtstrflush(Fmt*);
 #pragma	varargck	argpos	sprint		2
 
 #pragma	varargck	type	"lld"	vlong
+#pragma	varargck	type	"llo"	vlong
 #pragma	varargck	type	"llx"	vlong
+#pragma	varargck	type	"llb"	vlong
 #pragma	varargck	type	"lld"	uvlong
+#pragma	varargck	type	"llo"	uvlong
 #pragma	varargck	type	"llx"	uvlong
+#pragma	varargck	type	"llb"	uvlong
 #pragma	varargck	type	"ld"	long
+#pragma	varargck	type	"lo"	long
 #pragma	varargck	type	"lx"	long
 #pragma	varargck	type	"lb"	long
 #pragma	varargck	type	"ld"	ulong
+#pragma	varargck	type	"lo"	ulong
 #pragma	varargck	type	"lx"	ulong
 #pragma	varargck	type	"lb"	ulong
 #pragma	varargck	type	"d"	int
+#pragma	varargck	type	"o"	int
 #pragma	varargck	type	"x"	int
 #pragma	varargck	type	"c"	int
 #pragma	varargck	type	"C"	int

sys/lib/mimetype

@@ -146,7 +146,7 @@
 .txt		text		plain		-		y
 .ucert		application	x-x509-user-cert	-	y # DER X.509 user certificate
 .ustar		application	x-ustar		-		m
-.vcf		text		x-vcard		-		y # vCard
+.vcf		text		directory	-		y # vCard
 .wav		audio		x-wav		-		y
 .wbmp		image		vnd.wap.wbmp	-		y # wireless bitmap
 .wml		text		vnd.wap.wml	-		m # WML doc

sys/man/2/mach

@@ -1,7 +1,7 @@
 .TH MACH 2
 .SH NAME
 crackhdr, machbytype, machbyname, newmap, setmap, findseg, unusemap,
-loadmap, attachproc, get1, get2, get4, get8, put1, put2, put4, put8,
+loadmap, attachproc, get1, get2, get4, get8, geta, put1, put2, put4, put8, puta
 beswab, beswal, beswav, leswab, leswal, leswav \- machine-independent access to executable files
 .SH SYNOPSIS
 .B #include <u.h>
@@ -56,6 +56,9 @@ int get4(Map *map, ulong addr, long *val)
 int get8(Map *map, ulong addr, vlong *val)
 .PP
 .B
+int geta(Map *map, uvlong addr, uvlong *val)
+.PP
+.B
 int put1(Map *map, ulong addr, uchar *buf, int n)
 .PP
 .B
@@ -68,6 +71,9 @@ int put4(Map *map, ulong addr, long val)
 int put8(Map *map, ulong addr, vlong val)
 .PP
 .B
+int puta(Map *map, uvlong addr, uvlong val)
+.PP
+.B
 ushort beswab(ushort val)
 .PP
 .B

sys/src/9/pc/sdata.c

@@ -1923,7 +1923,8 @@ atapnp(void)
 			r &= ~0x2000;
 			pcicfgw32(p, 0x40, r);
 			break;
-		case (0x4379<<16)|0x1002:	/* ATI 4379 SATA*/
+		case (0x4379<<16)|0x1002:	/* ATI SB400 SATA*/
+		case (0x437a<<16)|0x1002:	/* ATI SB400 SATA */
 		case (0x439c<<16)|0x1002:	/* ATI 439c SATA*/
 		case (0x3373<<16)|0x105A:	/* Promise 20378 RAID */
 		case (0x4D30<<16)|0x105A:	/* Promise PDC202xx */
@@ -2001,9 +2002,7 @@ atapnp(void)
 			 * address for the registers (0x50?).
 			 */
 			/*FALLTHROUGH*/
-		case (0x4372<<16)|0x1002:	/* ATI SB400 */
-		case (0x4376<<16)|0x1002:	/* ATI Radeon Xpress 200M */
-		case (0x437a<<16)|0x1002:	/* ATI SB400 SATA */
+		case (0x4376<<16)|0x1002:	/* ATI SB400 PATA */
 			break;
 		case (0x0211<<16)|0x1166:	/* ServerWorks IB6566 */
 			{

sys/src/cmd/file.c

@@ -827,6 +827,8 @@ struct	FILE_STRING
 				"pem x.509 certificate", -1,	"text/plain",
 	"subject=/C=",		"pem certificate with header", -1, "text/plain",
 	"process snapshot ",	"process snapshot",	-1,	"application/snapfs",
+	"BEGIN:VCARD\r\n",	"vCard",		13,	"text/directory;profile=vcard",
+	"BEGIN:VCARD\n",	"vCard",		12,	"text/directory;profile=vcard",
 	0,0,0,0
 };
 

sys/src/libdraw/buildfont.c

@@ -129,7 +129,7 @@ freefont(Font *f)
 	}
 	for(i=0; i<f->nsubf; i++){
 		s = f->subf[i].f;
-		if(s && s!=display->defaultsubfont)
+		if(s && display && s!=display->defaultsubfont)
 			freesubfont(s);
 	}
 	freeimage(f->cacheimage);