From 8987674d48c2e95b21f0c79cfd6cedf61d7de395 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@centraldogma>
Date: Mon, 23 May 2011 23:11:29 +0000
Subject: aux/vga: pci.c dircount bug

---
 sys/src/cmd/aux/vga/pci.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/src/cmd/aux/vga/pci.c b/sys/src/cmd/aux/vga/pci.c
index 784ccf238..cc5babecb 100644
--- a/sys/src/cmd/aux/vga/pci.c
+++ b/sys/src/cmd/aux/vga/pci.c
@@ -27,8 +27,11 @@ pcicfginit(void)
 	for(i=0; i<n; i++) {
 		if(strstr(d[i].name, "ctl") == nil)
 			continue;
+		if((j = strlen(d[i].name)-3) < 5)
+			continue;
+
+		sprint(buf, "%.*s", j, d[i].name);
 
-		sprint(buf, "%s", d[i].name);
 		bno = strtoul(buf, &s, 10);
 		dno = strtoul(s+1, &s, 10);
 		fno = strtoul(s+1, nil, 10);
@@ -37,22 +40,25 @@ pcicfginit(void)
 		p->tbdf = MKBUS(BusPCI, bno, dno, fno);
 		sprint(buf, "%s/%d.%d.%draw", base, bno, dno, fno);
 		if((p->rawfd = open(buf, ORDWR)) < 0){
+			fprint(2, "raw: %r\n");
 			free(p);
 			continue;
 		}
 		sprint(buf, "%s/%d.%d.%dctl", base, bno, dno, fno);
 		if((fd = open(buf, OREAD)) < 0){
+			fprint(2, "ctl: %r\n");
 			close(p->rawfd);
 			free(p);
 			continue;
 		}
-		if((n = read(fd, buf, sizeof(buf)-1)) <= 0){
+		if((j = read(fd, buf, sizeof(buf)-1)) <= 0){
+			fprint(2, "read: %r\n");
 			close(p->rawfd);
 			close(fd);
 			free(p);
 			continue;
 		}
-		buf[n] = 0;
+		buf[j] = 0;
 		close(fd);
 
 		p->ccru = strtol(buf + 3, nil, 16);
-- 
cgit v1.2.3