Plan 9 from Bell Labs 2003-08-05

dist/replica/plan9.db

@@ -148,7 +148,7 @@
 386/bin/aux/tr2post - 775 sys sys 1056364217 176207
 386/bin/aux/trampoline - 775 sys sys 1056364218 81185
 386/bin/aux/typepasswd - 775 sys sys 1056364218 68176
-386/bin/aux/vga - 775 sys sys 1056364219 300334
+386/bin/aux/vga - 775 sys sys 1060012301 300350
 386/bin/aux/vmmousepoll - 775 sys sys 1032480572 41434
 386/bin/aux/vmware - 775 sys sys 1049428256 453
 386/bin/aux/vmwarefs - 775 sys sys 1045537962 102172
@@ -6824,7 +6824,7 @@ sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1014925010 35895
 sys/src/cmd/aux/vga/mkfile - 664 sys sys 1048636613 905
 sys/src/cmd/aux/vga/neomagic.c - 664 sys sys 1014925010 8801
 sys/src/cmd/aux/vga/notes.txt - 664 sys sys 1028334647 14376
-sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1054479635 12043
+sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1060012272 12142
 sys/src/cmd/aux/vga/palette.c - 664 sys sys 1014925010 2201
 sys/src/cmd/aux/vga/pci.c - 664 sys sys 1014925011 8659
 sys/src/cmd/aux/vga/pci.h - 664 sys sys 1014925011 3290
@@ -10511,8 +10511,8 @@ sys/src/cmd/upas/ml/ml.c - 664 sys sys 1031707314 2703
 sys/src/cmd/upas/ml/mlmgr.c - 664 sys sys 1045505888 2332
 sys/src/cmd/upas/ml/mlowner.c - 664 sys sys 1015096763 1142
 sys/src/cmd/upas/ned - 20000000775 sys sys 1015013194 0
-sys/src/cmd/upas/ned/mkfile - 664 sys sys 1031707295 261
-sys/src/cmd/upas/ned/nedmail.c - 664 sys sys 1055703158 42722
+sys/src/cmd/upas/ned/mkfile - 664 sys sys 1060041738 233
+sys/src/cmd/upas/ned/nedmail.c - 664 sys sys 1060041739 42848
 sys/src/cmd/upas/pop3 - 20000000775 sys sys 1015009816 0
 sys/src/cmd/upas/pop3/mkfile - 664 sys sys 1031707311 214
 sys/src/cmd/upas/pop3/pop3.c - 664 sys sys 1021579996 14144

dist/replica/plan9.log

@@ -13015,3 +13015,7 @@
 1059681726 1 a lib/face/48x48x1/b/boyd.1 - 664 sys sys 1059681078 1057
 1059697933 0 c 386/bin/dial/pass - 775 sys sys 1059696921 39305
 1059697933 1 c sys/src/cmd/dial/pass.c - 664 sys sys 1059696920 1297
+1060012960 0 c 386/bin/aux/vga - 775 sys sys 1060012301 300350
+1060012960 1 c sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1060012272 12142
+1060041774 0 c sys/src/cmd/upas/ned/mkfile - 664 sys sys 1060041738 233
+1060041774 1 c sys/src/cmd/upas/ned/nedmail.c - 664 sys sys 1060041739 42848

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

@@ -52,7 +52,13 @@ snarf(Vga* vga, Ctlr* ctlr)
 	if(vga->private == nil){
 		vga->private = alloc(sizeof(Nvidia));
 		nv = vga->private;
-		if((p = pcimatch(0, 0x10DE, 0)) == nil)
+
+		p = nil;
+		while((p = pcimatch(p, 0x10DE, 0)) != nil){
+			if((p->ccru>>8) == 3)
+				break;
+		}
+		if(p == nil)
 			error("%s: not found\n", ctlr->name);
 		if(p->did < 0x20)
 			error("%s: DID %4.4uX unsupported\n", ctlr->name, p->did);
@@ -72,7 +78,8 @@ snarf(Vga* vga, Ctlr* ctlr)
 		vgactlw("type", ctlr->name);
 
 		if((m = segattach(0, "nvidiammio", 0, p->mem[0].size)) == -1)
-			error("%s: can't attach mmio segment\n", ctlr->name);
+			error("%s: segattach nvidiammio, size %d: %r\n",
+				ctlr->name, p->mem[0].size);
 
 		nv->pci = p;
 		nv->mmio = m;

sys/src/cmd/upas/ned/mkfile

@@ -14,7 +14,6 @@ UPDATE=\
 	mkfile\
 	${OFILES:%.$O=%.c}\
 	$HFILES\
-	${TARG:%=/386/bin/upas/%}\
 
 </sys/src/cmd/mkone
 CFLAGS=$CFLAGS -I../common

sys/src/cmd/upas/ned/nedmail.c

@@ -123,7 +123,7 @@ struct {
 	{ "u",	0,	ucmd,	"u        remove deletion mark" },
 	{ "w",	1,	wcmd,	"w file   store message contents as file" },
 	{ "x",	0,	xcmd,	"x        exit without flushing deleted messages" },
-	{ "y",	0,	ycmd,	"x        synchronize with mail box" },
+	{ "y",	0,	ycmd,	"y        synchronize with mail box" },
 	{ "=",	1,	eqcmd,	"=        print current message number" },
 	{ "|",	1,	pipecmd, "|cmd     pipe message body to a command" },
 	{ "||",	1,	rpipecmd, "|cmd     pipe raw message to a command" },
@@ -191,6 +191,15 @@ catchnote(void*, char *note)
 	noted(NDFLT);
 }
 
+char *
+plural(int n)
+{
+	if (n == 1)
+		return "";
+
+	return "s";		
+}
+
 void
 main(int argc, char **argv)
 {
@@ -270,7 +279,7 @@ main(int argc, char **argv)
 		n = dir2message(&top, reverse);
 		if(n < 0)
 			sysfatal("can't read %s", s_to_c(top.path));
-		Bprint(&out, "%d messages\n", n);
+		Bprint(&out, "%d message%s\n", n, plural(n));
 	}
 
 	notify(catchnote);
@@ -1152,7 +1161,7 @@ messagecount(Message *m)
 	i = 0;
 	for(; m != nil; m = m->next)
 		i++;
-	Bprint(&out, "%d messages\n", i);
+	Bprint(&out, "%d message%s\n", i, plural(i));
 }
 
 Message*
@@ -1433,6 +1442,7 @@ flushdeleted(Message *cur)
 	Message *m, **l;
 	char buf[1024], *p, *e, *msg;
 	int deld, n, fd;
+	int i;
 
 	doflush = 0;
 	deld = 0;
@@ -1481,16 +1491,13 @@ flushdeleted(Message *cur)
 
 	close(fd);
 
-	switch(deld){
-	case 0:
-		break;
-	case 1:
-		Bprint(&out, "!1 message deleted\n");
-		break;
-	default:
-		Bprint(&out, "!%d messages deleted\n", deld);
-		break;
-	}
+	if(deld)
+		Bprint(&out, "!%d message%s deleted\n", deld, plural(deld));
+
+	// renumber
+	i = 1;
+	for(m = top.child; m != nil; m = m->next)
+		m->id = natural ? m->fileno : i++;
 
 	if(cur == nil)
 		return top.child;
@@ -1569,7 +1576,7 @@ icmd(Cmd*, Message *m)
 
 	n = dir2message(&top, reverse);
 	if(n > 0)
-		Bprint(&out, "%d new messages\n", n);
+		Bprint(&out, "%d new message%s\n", n, plural(n));
 	return m;
 }