Plan 9 from Bell Labs 2010-10-16

sys/src/boot/pc/load.c

@@ -346,7 +346,7 @@ main(void)
 	if (askbiosload) {
 		line[0] = '\0';
 		getstr("use bios drivers (e.g., for usb)", line, sizeof line,
-			"no", 60*1000);
+			"no", 60);
 		biosload = strncmp(line, "yes", 3) == 0;
 	}
 

sys/src/cmd/aux/vga/io.c

@@ -252,12 +252,12 @@ dumpbios(long size)
 	buf = alloc(size);
 	offset = 0xC0000;
 	if(doreadbios((char*)buf, size, offset) != size)
-		error("short bios read in dumpbios");
+		error("short bios read in dumpbios\n");
 
 	if(buf[0] != 0x55 || buf[1] != 0xAA){
 		offset = 0xE0000;
 		if(doreadbios((char*)buf, size, offset) != size)
-			error("short bios read in dumpbios");
+			error("short bios read in dumpbios\n");
 		if(buf[0] != 0x55 || buf[1] != 0xAA){
 			free(buf);
 			return;

sys/src/cmd/aux/vga/main.c

@@ -281,7 +281,7 @@ main(int argc, char** argv)
 
 	for(ctlr = vga->link; ctlr; ctlr = ctlr->link)
 		if(ctlr->flag & Ferror)
-			error("%r");
+			error("%r\n");
 
 	if(iflag || lflag){
 		if(getenv(type))
@@ -369,7 +369,7 @@ main(int argc, char** argv)
 			if(vga->mode->z < nelem(chanstr) && chanstr[vga->mode->z])
 				strcpy(vga->mode->chan, chanstr[vga->mode->z]);
 			else
-				error("%s: unknown channel type to use for depth %d", vga->ctlr->name, vga->mode->z);
+				error("%s: unknown channel type to use for depth %d\n", vga->ctlr->name, vga->mode->z);
 		}
 
 		if(iflag || pflag)

sys/src/cmd/aux/vga/mga4xx.c

@@ -1125,11 +1125,11 @@ init(Vga* vga, Ctlr* ctlr)
 		mga->maxpclk	= 250000000;
 
 	if (mode->frequency < 50000)
-		error("mga: Too little Frequency %d : Minimum supported by PLL is %d", 
+		error("mga: Too little Frequency %d : Minimum supported by PLL is %d\n", 
 			mode->frequency, 50000);
 
 	if (mode->frequency > mga->maxpclk)
-		error("mga: Too big Frequency %d : Maximum supported by PLL is %ld",
+		error("mga: Too big Frequency %d : Maximum supported by PLL is %ld\n",
 			mode->frequency, mga->maxpclk);
 	
 	trace("mga: revision ID is %x\n", mga->revid);

sys/src/cmd/aux/vga/radeon.c

@@ -23,7 +23,7 @@ enum {
 
 typedef struct Radeon Radeon;
 struct Radeon {
-	ulong	mmio;
+	uintptr	mmio;
 	Pcidev	*pci;
 	uchar	*bios;
 
@@ -243,8 +243,8 @@ snarf(Vga *vga, Ctlr *ctlr)
 		if (mmio == ~0)
 			error("%s: can't attach mmio segment\n", ctlr->name);
 
-		DBGPRINT("radeon: mmio address: 0x%08ulx [size=0x%x]\n",
-			mmio, p->mem[2].size);
+		DBGPRINT("radeon: mmio address: %08#p [size=%#x]\n",
+			(void *)mmio, p->mem[2].size);
 
 		radeon->pci = p;
 		radeon->r300_workaround = isr300;

sys/src/cmd/aux/vga/vesa.c

@@ -201,7 +201,7 @@ static void
 load(Vga* vga, Ctlr* ctlr)
 {
 	if(vbe == nil)
-		error("no vesa bios");
+		error("no vesa bios\n");
 	if(vbesetmode(vbe, atoi(dbattr(vga->mode->attr, "id"))) < 0){
 		ctlr->flag |= Ferror;
 		fprint(2, "vbesetmode: %r\n");

sys/src/cmd/aux/vga/virge.c

@@ -388,7 +388,7 @@ init(Vga* vga, Ctlr* ctlr)
 			 * 32-bit mode (which the GX/2 calls 24-bit unpacked mode).
 			 */
 			if(id != 0x8A10)
-				error("32-bit mode only supported on the GX/2");
+				error("32-bit mode only supported on the GX/2\n");
 			vga->crt[0x67] |= 0xD0;
 			break;
 		}

sys/src/cmd/aux/vga/vmware.c

@@ -207,12 +207,12 @@ init(Vga* vga, Ctlr* ctlr)
 
 	vmwr(vm, Rid, (0x900000<<8)|2);
 	if(vmrd(vm, Rid)&0xFF != 2)
-		error("old vmware svga version %lud; need version 2",
+		error("old vmware svga version %lud; need version 2\n",
 			vmrd(vm,Rid)&0xFF);
 
 	ctlr->flag |= Ulinear;
 	if(strcmp(vm->chan, "unknown") == 0)
-		error("couldn't translate color masks into channel");
+		error("couldn't translate color masks into channel\n");
 
 	/* Always use the screen depth, and clip the screen size */
 	vga->mode->z = vm->r[Rbpp];

sys/src/cmd/ed.c

@@ -856,7 +856,7 @@ void
 browse(void)
 {
 	int forward, n;
-	static bformat, bnum; /* 0 */
+	static int bformat, bnum; /* 0 */
 
 	forward = 1;
 	peekc = getchr();

sys/src/cmd/ip/imap4d/imap4d.c

@@ -1200,7 +1200,7 @@ statusCmd(char *tg, char *cmd)
 		return;
 	}
 
-	Bprint(&bout, "* STATUS (");
+	Bprint(&bout, "* STATUS %s (", mbox);
 	s = "";
 	for(i = 0; statusItems[i].name != nil; i++){
 		if(si & statusItems[i].v){

sys/src/cmd/ip/imap4d/list.c

@@ -360,7 +360,7 @@ checkMatch(char *cmd, char *ref, char *pat, char *mbox, long mtime, int isdir)
 
 	s = strmutf7(mbox);
 	if(s != nil)
-		Bprint(&bout, "* %s %s \"/\" %s\r\n", cmd, flags, s);
+		Bprint(&bout, "* %s %s \"/\" \"%s\"\r\n", cmd, flags, s);
 	return 1;
 }
 

sys/src/cmd/ip/imap4d/mbox.c

@@ -84,7 +84,7 @@ openBox(char *name, char *fsname, int writable)
 	fsInit();
 	debuglog("imap4d open %s %s\n", name, fsname);
 
-	if(fprint(fsCtl, "open /mail/box/%s/%s %s", username, name, fsname) < 0){
+	if(fprint(fsCtl, "open '/mail/box/%s/%s' %s", username, name, fsname) < 0){
 //ZZZ
 		char err[ERRMAX];