Plan 9 from Bell Labs 2012-12-11

sys/man/1/news

@@ -54,7 +54,7 @@ are ignored.
 .B /lib/news/*
 articles
 .TP
-.B $HOME/lib/newstime
+.B $home/lib/newstime
 modify time is time news was last read
 .TP
 .B /sys/lib/subscribers

sys/man/7/juke

@@ -358,9 +358,12 @@ is the text field of the object.
 is the type of the object
 .LP
 .SH FILES
-.BR /sys/lib/music/map :
+.TF /sys/lib/music/map
+.TP
+.B /sys/lib/music/map
 Default map file
-.BR /mnt/juke :
+.TP
+.B /mnt/juke
 Default mount point for the music database.
 .SH SOURCE
 .B /sys/src/games/music

sys/man/8/venti-fmt

@@ -7,8 +7,7 @@ conf,
 fmtarenas,
 fmtbloom,
 fmtindex,
-fmtisect,
-syncindex \- prepare and maintain a venti server
+fmtisect \- prepare and maintain a venti server
 .SH SYNOPSIS
 .PP
 .B venti/fmtarenas

sys/src/cmd/aux/msexceltables.c

@@ -196,9 +196,8 @@ cell(int r, int c, int f, int type, void *val)
 }
 
 struct Tm *
-bifftime(double num)
+bifftime(double t)
 {
-	long long t = num;
 
 	/* Beware - These epochs are wrong, this
 	 * is due to Excel still remaining compatible

sys/src/cmd/kl/obj.c

@@ -72,7 +72,7 @@ main(int argc, char *argv[])
 	} ARGEND
 	USED(argc);
 	if(*argv == 0) {
-		diag("usage: vl [-options] objects");
+		diag("usage: %cl [-options] objects", thechar);
 		errorexit();
 	}
 	if(!debug['9'] && !debug['U'] && !debug['B'])

sys/src/cmd/paqfs/paqfs.c

@@ -493,7 +493,7 @@ readdir(Fid *f)
 			off = 0;
 			i++;
 			blockFree(b);
-			b = blockLoad(getl(ptr->data + i*4), DataBlock);
+			b = blockLoad(getl(ptr->data + i*4), DirBlock);
 		}
 	}
 	f->offset = i*blocksize + off;

sys/src/cmd/usb/kb/kb.c

@@ -320,8 +320,14 @@ ptrbootpvals(KDev *kd, Chain *ch, int *px, int *py, int *pb)
 	c = ch->e / 8;
 	if(c < 3)
 		return -1;
-	x = hidifcval(&kd->templ, KindX, 0);
-	y = hidifcval(&kd->templ, KindY, 0);
+	if(kd->templ.nifcs){
+		x = hidifcval(&kd->templ, KindX, 0);
+		y = hidifcval(&kd->templ, KindY, 0);
+	}else{
+		/* no report descriptor for boot protocol */
+		x = ((signed char*)ch->buf)[1];
+		y = ((signed char*)ch->buf)[2];
+	}
 
 	b = maptab[ch->buf[0] & 0x7];
 	if(c > 3 && ch->buf[3] == 1)		/* up */
@@ -342,7 +348,7 @@ ptrwork(void* a)
 	Chain ch;
 	KDev* f = a;
 
-	threadsetname("ptr %s", f->in->name);
+	threadsetname("ptr %s", f->ep->dir);
 	hipri = nerrs = 0;
 	ptrfd = f->ep->dfd;
 	mfd = f->in->fd;
@@ -551,7 +557,7 @@ kbdwork(void *a)
 	char err[128];
 	KDev *f = a;
 
-	threadsetname("kbd %s", f->in->name);
+	threadsetname("kbd %s", f->ep->dir);
 	kbdfd = f->ep->dfd;
 
 	if(f->ep->maxpkt < 3 || f->ep->maxpkt > sizeof buf)

sys/src/cmd/usb/lib/devs.c

@@ -31,6 +31,7 @@ workproc(void *a)
 	int (*f)(Dev*,int,char**);
 
 	pa = a;
+	threadsetname("workproc %s", pa->dev->dir);
 	strecpy(args, args+sizeof(args), pa->args);	/* don't leak */
 	d = pa->dev;
 	f = pa->f;

sys/src/cmd/usb/lib/fs.c

@@ -336,6 +336,7 @@ fsioproc(void* a)
 	Fcall *t, *r;
 	Fid *fid;
 
+	threadsetname("fsioproc");
 	dprint(2, "%s: fsioproc pid %d\n", argv0, getpid());
 	while((rpc = recvp(p)) != nil){
 		t = &rpc->t;
@@ -542,6 +543,7 @@ outproc(void*)
 
 	if(once++ != 0)
 		sysfatal("more than one outproc");
+	threadsetname("outproc");
 	for(;;){
 		do
 			rpc = recvp(outc);
@@ -580,6 +582,7 @@ usbfs(void*)
 	if(once++ != 0)
 		sysfatal("more than one usbfs proc");
 
+	threadsetname("usbfs");
 	outc = chancreate(sizeof(Rpc*), 1);
 	procc = chancreate(sizeof(Channel*), 0);
 	endc = chancreate(sizeof(Channel*), 0);

sys/src/cmd/usb/usbd/usbd.c

@@ -642,6 +642,7 @@ work(void *a)
 	int i;
 
 	portc = a;
+	threadsetname("work");
 	hubs = nil;
 	/*
 	 * Receive requests for root hubs