Plan 9 from Bell Labs 2007-10-27

dist/replica/_plan9.db

@@ -215,7 +215,7 @@
 386/bin/disk/mkext - 775 sys sys 1168402303 82886
 386/bin/disk/mkfs - 775 sys sys 1168402303 87969
 386/bin/disk/mksacfs - 775 sys sys 1020319074 71451
-386/bin/disk/partfs - 775 sys sys 1193282249 149872
+386/bin/disk/partfs - 775 sys sys 1193426743 149859
 386/bin/disk/prep - 775 sys sys 1168402303 96167
 386/bin/disk/sacfs - 775 sys sys 1020319075 79882
 386/bin/dossrv - 775 sys sys 1178568267 136537
@@ -7844,7 +7844,7 @@ sys/man/8/na - 664 sys sys 958527089 859
 sys/man/8/ndb - 664 sys sys 1191867910 14502
 sys/man/8/newuser - 664 sys sys 1116954242 2418
 sys/man/8/nfsserver - 664 sys sys 1191524525 3576
-sys/man/8/partfs - 664 sys sys 1193264932 851
+sys/man/8/partfs - 664 sys sys 1193418360 869
 sys/man/8/pcmcia - 664 sys sys 944959679 408
 sys/man/8/pem - 664 sys sys 1060263669 1189
 sys/man/8/ping - 664 sys sys 1169105315 3650
@@ -8653,7 +8653,7 @@ sys/src/ape/lib/ap/gen/memcmp.c - 664 sys sys 1014921988 262
 sys/src/ape/lib/ap/gen/memmove.c - 664 sys sys 1014921987 433
 sys/src/ape/lib/ap/gen/memset.c - 664 sys sys 1014921988 135
 sys/src/ape/lib/ap/gen/mkfile - 664 sys sys 1038237524 837
-sys/src/ape/lib/ap/gen/mktime.c - 664 sys sys 1014921987 2401
+sys/src/ape/lib/ap/gen/mktime.c - 664 sys sys 1193430538 2373
 sys/src/ape/lib/ap/gen/qsort.c - 664 sys sys 1014921987 2893
 sys/src/ape/lib/ap/gen/raise.c - 664 sys sys 1014921987 185
 sys/src/ape/lib/ap/gen/rand.c - 664 sys sys 1014921987 1105
@@ -10244,7 +10244,7 @@ sys/src/cmd/disk/mbr.c - 664 sys sys 1080218150 4325
 sys/src/cmd/disk/mkext.c - 664 sys sys 1166823931 5805
 sys/src/cmd/disk/mkfile - 664 sys sys 1193264991 509
 sys/src/cmd/disk/mkfs.c - 664 sys sys 1108000852 14697
-sys/src/cmd/disk/partfs.c - 664 sys sys 1193279294 9714
+sys/src/cmd/disk/partfs.c - 664 sys sys 1193417445 9641
 sys/src/cmd/disk/prep - 20000000775 sys sys 1055692957 0
 sys/src/cmd/disk/prep/calc.y - 664 sys sys 1135487935 2406
 sys/src/cmd/disk/prep/edit.c - 664 sys sys 1017854327 9714
@@ -10425,7 +10425,6 @@ sys/src/cmd/freq.c - 664 sys sys 1136378273 1728
 sys/src/cmd/getmap.c - 664 sys sys 954468786 3290
 sys/src/cmd/grap - 20000000775 sys sys 1039727558 0
 sys/src/cmd/grap/coord.c - 664 sys sys 944960999 1559
-sys/src/cmd/grap/find - 775 sys sys 944960999 37
 sys/src/cmd/grap/for.c - 664 sys sys 944960999 1890
 sys/src/cmd/grap/frame.c - 664 sys sys 944960999 1572
 sys/src/cmd/grap/grap.h - 664 sys sys 944960999 6090
@@ -15748,3 +15747,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/lib/ape/libap.a - 664 sys sys 1193455425 820230

dist/replica/plan9.db

@@ -215,7 +215,7 @@
 386/bin/disk/mkext - 775 sys sys 1168402303 82886
 386/bin/disk/mkfs - 775 sys sys 1168402303 87969
 386/bin/disk/mksacfs - 775 sys sys 1020319074 71451
-386/bin/disk/partfs - 775 sys sys 1193282249 149872
+386/bin/disk/partfs - 775 sys sys 1193426743 149859
 386/bin/disk/prep - 775 sys sys 1168402303 96167
 386/bin/disk/sacfs - 775 sys sys 1020319075 79882
 386/bin/dossrv - 775 sys sys 1178568267 136537
@@ -543,7 +543,7 @@
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 1070519112 0
 386/lib/ape/lib9.a - 664 sys sys 1135531447 6906
-386/lib/ape/libap.a - 664 sys sys 1189196502 820240
+386/lib/ape/libap.a - 664 sys sys 1193455425 820230
 386/lib/ape/libbsd.a - 664 sys sys 1184467169 183900
 386/lib/ape/libdraw.a - 664 sys sys 1179372118 622218
 386/lib/ape/libfmt.a - 664 sys sys 1146156980 156706
@@ -7844,7 +7844,7 @@ sys/man/8/na - 664 sys sys 958527089 859
 sys/man/8/ndb - 664 sys sys 1191867910 14502
 sys/man/8/newuser - 664 sys sys 1116954242 2418
 sys/man/8/nfsserver - 664 sys sys 1191524525 3576
-sys/man/8/partfs - 664 sys sys 1193264932 851
+sys/man/8/partfs - 664 sys sys 1193418360 869
 sys/man/8/pcmcia - 664 sys sys 944959679 408
 sys/man/8/pem - 664 sys sys 1060263669 1189
 sys/man/8/ping - 664 sys sys 1169105315 3650
@@ -8653,7 +8653,7 @@ sys/src/ape/lib/ap/gen/memcmp.c - 664 sys sys 1014921988 262
 sys/src/ape/lib/ap/gen/memmove.c - 664 sys sys 1014921987 433
 sys/src/ape/lib/ap/gen/memset.c - 664 sys sys 1014921988 135
 sys/src/ape/lib/ap/gen/mkfile - 664 sys sys 1038237524 837
-sys/src/ape/lib/ap/gen/mktime.c - 664 sys sys 1014921987 2401
+sys/src/ape/lib/ap/gen/mktime.c - 664 sys sys 1193430538 2373
 sys/src/ape/lib/ap/gen/qsort.c - 664 sys sys 1014921987 2893
 sys/src/ape/lib/ap/gen/raise.c - 664 sys sys 1014921987 185
 sys/src/ape/lib/ap/gen/rand.c - 664 sys sys 1014921987 1105
@@ -10244,7 +10244,7 @@ sys/src/cmd/disk/mbr.c - 664 sys sys 1080218150 4325
 sys/src/cmd/disk/mkext.c - 664 sys sys 1166823931 5805
 sys/src/cmd/disk/mkfile - 664 sys sys 1193264991 509
 sys/src/cmd/disk/mkfs.c - 664 sys sys 1108000852 14697
-sys/src/cmd/disk/partfs.c - 664 sys sys 1193279294 9714
+sys/src/cmd/disk/partfs.c - 664 sys sys 1193417445 9641
 sys/src/cmd/disk/prep - 20000000775 sys sys 1055692957 0
 sys/src/cmd/disk/prep/calc.y - 664 sys sys 1135487935 2406
 sys/src/cmd/disk/prep/edit.c - 664 sys sys 1017854327 9714
@@ -10425,7 +10425,6 @@ sys/src/cmd/freq.c - 664 sys sys 1136378273 1728
 sys/src/cmd/getmap.c - 664 sys sys 954468786 3290
 sys/src/cmd/grap - 20000000775 sys sys 1039727558 0
 sys/src/cmd/grap/coord.c - 664 sys sys 944960999 1559
-sys/src/cmd/grap/find - 775 sys sys 944960999 37
 sys/src/cmd/grap/for.c - 664 sys sys 944960999 1890
 sys/src/cmd/grap/frame.c - 664 sys sys 944960999 1572
 sys/src/cmd/grap/grap.h - 664 sys sys 944960999 6090

dist/replica/plan9.log

@@ -53153,3 +53153,10 @@
 1193365804 11 c 386/9pcf.gz - 664 sys sys 1191889940 1230163
 1193365804 12 c 386/9pxeload - 775 sys sys 1193358656 336920
 1193365804 13 c sys/man/8/9load - 664 sys sys 1193364197 9814
+1193418005 0 c sys/man/8/partfs - 664 sys sys 1193417473 864
+1193418005 1 c sys/src/cmd/disk/partfs.c - 664 sys sys 1193417445 9641
+1193419804 0 c sys/man/8/partfs - 664 sys sys 1193418360 869
+1193427004 0 c 386/bin/disk/partfs - 775 sys sys 1193426743 149859
+1193430604 0 c sys/src/ape/lib/ap/gen/mktime.c - 664 sys sys 1193430538 2373
+1193441403 0 d sys/src/cmd/grap/find - 775 sys sys 944960999 0
+1193455803 0 c 386/lib/ape/libap.a - 664 sys sys 1193455425 820230

sys/man/8/partfs

@@ -4,11 +4,11 @@ partfs \- serve file, with partitions
 .SH SYNOPSIS
 .B disk/partfs
 [
-.B -r
+.B -Dr
 ]
 [
-.B -f
-.I file
+.B -d
+.I diskname
 ]
 [
 .B -m
@@ -18,13 +18,11 @@ partfs \- serve file, with partitions
 .B -s
 .I srvname
 ]
-[
-.I diskname
-]
+.I diskimage
 .SH DESCRIPTION
 .I Partfs
-presents
-.I file
+presents the file
+.I diskimage
 in the manner of
 .IR sd (3)
 on
@@ -32,7 +30,7 @@ on
 (default
 .BR /dev/sdXX ).
 Changes made to the disk are written through to
-.I file
+.I diskimage
 unless the
 .B -r
 option is given.
@@ -54,7 +52,7 @@ Partition a USB flash device:
 .IP
 .EX
 usb/disk
-disk/partfs -f /n/disk/0/data
+disk/partfs /n/disk/0/data
 disk/mbr /dev/sdXX/data
 disk/fdisk -baw /dev/sdXX/data
 disk/prep /dev/sdXX/plan9

sys/src/ape/lib/ap/gen/mktime.c

@@ -3,7 +3,7 @@
 /*
  * BUG: Doesn't do leap years in full glory,
  * or calendar changes. In 2038 the sign bit
- * will be needed in clock_t, but we say it
+ * will be needed in time_t, but we say it
  * can't be represented.
  */
 static int
@@ -38,14 +38,14 @@ reduce(int *v, int *next, int mult)
 	while(*v < 0){
 		*v += mult;
 		oldnext = *next;
-		*next--;
+		--*next;
 		if(!(*next < oldnext))
 			return 0;
 	}
 	while(*v >= mult){
 		*v -= mult;
 		oldnext = *next;
-		*next++;
+		++*next;
 		if(!(*next > oldnext))
 			return 0;
 	}
@@ -73,7 +73,7 @@ mktime(struct tm *t)
 	     reduce(&t->tm_min, &t->tm_hour, 60) &&
 	     reduce(&t->tm_hour, &t->tm_mday, 24) &&
 	     reduce(&t->tm_mon, &t->tm_year, 12)))
-		return (clock_t)-1;
+		return -1;
 	while(t->tm_mday < 1){
 		if(--t->tm_mon == -1){
 			t->tm_mon = 11;
@@ -96,11 +96,11 @@ mktime(struct tm *t)
 	if(t->tm_year < 70){
 		for(i=t->tm_year; i<70; i++)
 			if((a -= dysize(i)*86400L) < 0)
-				return (clock_t)-1;
+				return -1;
 	}else if(t->tm_year > 70){
 		for(i=70; i<t->tm_year; i++)
 			if((a += dysize(i)*86400L) < 0)
-				return (clock_t)-1;
+				return -1;
 	}
 	/*
 	 * Now a is number of seconds past Jan 1 1970.

sys/src/cmd/disk/partfs.c

@@ -491,7 +491,7 @@ char *srvname;
 void
 usage(void)
 {
-	fprint(2, "usage: %s [-D] [-f file] [-s srvname] [-m mtpt] [sdXX]\n",
+	fprint(2, "usage: %s [-Dr] [-d sdname] [-m mtpt] [-s srvname] diskimage\n",
 		argv0);
 	fprint(2, "\tdefault mtpt is /dev\n");
 	exits("usage");
@@ -504,7 +504,6 @@ main(int argc, char **argv)
 	char *file, *cname;
 	Dir *dir;
 
-	file = nil;
 	quotefmtinstall();
 	time0 = time(0);
 
@@ -512,8 +511,8 @@ main(int argc, char **argv)
 	case 'D':
 		chatty9p++;
 		break;
-	case 'f':
-		file = EARGF(usage());
+	case 'd':
+		sdname = EARGF(usage());
 		break;
 	case 'm':
 		mtpt = EARGF(usage());
@@ -528,12 +527,9 @@ main(int argc, char **argv)
 		usage();
 	}ARGEND
 
-	if(argc > 1)
+	if(argc != 1)
 		usage();
-	if(argc == 1)
-		sdname = argv[0];
-	if(!file)
-		sysfatal("no underlying file named");
+	file = argv[0];
 	dir = dirstat(file);
 	if(!dir)
 		sysfatal("%s: %r", file);

sys/src/cmd/grap/find

@@ -1 +0,0 @@
-exec /usr/bin/egrep -n "$1" *.[chyl]