Plan 9 from Bell Labs 2005-08-18

dist/replica/_plan9.db

@@ -9547,7 +9547,7 @@ sys/src/cmd/aux/mnihongo/mkfile - 664 sys sys 944960789 95
 sys/src/cmd/aux/mnihongo/mnihongo.c - 664 sys sys 946759402 6406
 sys/src/cmd/aux/mnihongo/tmac.nihongo - 664 sys sys 944960789 22
 sys/src/cmd/aux/mouse.c - 664 sys sys 1063855425 7049
-sys/src/cmd/aux/ms2.c - 664 sys sys 1015008685 3129
+sys/src/cmd/aux/ms2.c - 664 sys sys 1124305056 3153
 sys/src/cmd/aux/msexceltables.c - 664 sys sys 1116594581 13722
 sys/src/cmd/aux/mswordstrings.c - 664 sys sys 952201344 5767
 sys/src/cmd/aux/na - 20000000775 sys sys 955036627 0
@@ -10019,7 +10019,7 @@ sys/src/cmd/fax/receiverc - 775 sys sys 944960990 581
 sys/src/cmd/fax/send.c - 664 sys sys 944960990 923
 sys/src/cmd/fax/subr.c - 664 sys sys 1015090401 1245
 sys/src/cmd/fcp.c - 664 sys sys 1110816880 3780
-sys/src/cmd/file.c - 664 sys sys 1113312632 23324
+sys/src/cmd/file.c - 664 sys sys 1124305142 23332
 sys/src/cmd/fmt.c - 664 sys sys 1070032009 4088
 sys/src/cmd/fortune.c - 664 sys sys 1072729222 1779
 sys/src/cmd/fossil - 20000000775 sys sys 1042005512 0
@@ -12603,7 +12603,7 @@ sys/src/cmd/postscript/trofftable/trofftable.rc - 664 sys sys 984789206 2637
 sys/src/cmd/postscript/trofftable/trofftable.sh - 664 sys sys 984789206 2613
 sys/src/cmd/pr.c - 664 sys sys 1050689592 11172
 sys/src/cmd/primes.c - 664 sys sys 944961351 2126
-sys/src/cmd/prof.c - 664 sys sys 1067718957 5521
+sys/src/cmd/prof.c - 664 sys sys 1124305301 5547
 sys/src/cmd/proof - 20000000775 sys sys 944961622 0
 sys/src/cmd/proof/font.c - 664 sys sys 944961621 8525
 sys/src/cmd/proof/htroff.c - 664 sys sys 955223407 10496
@@ -13002,7 +13002,7 @@ sys/src/cmd/time.c - 664 sys sys 1014926662 1546
 sys/src/cmd/tlsclient.c - 664 sys sys 1024375149 1631
 sys/src/cmd/tlssrv.c - 664 sys sys 1087829606 3411
 sys/src/cmd/touch.c - 664 sys sys 1099760670 899
-sys/src/cmd/tprof.c - 664 sys sys 1063858806 2716
+sys/src/cmd/tprof.c - 664 sys sys 1124305452 2731
 sys/src/cmd/tr.c - 664 sys sys 944961464 6008
 sys/src/cmd/trace.c - 664 sys sys 1121367076 17928
 sys/src/cmd/troff - 20000000775 sys sys 944961294 0
@@ -14957,3 +14957,7 @@ 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/bin/file - 775 sys sys 1124335228 118879
+386/bin/prof - 775 sys sys 1124335228 107945
+386/bin/aux/ms2 - 775 sys sys 1124335228 85677
+386/bin/tprof - 775 sys sys 1124335229 290189

dist/replica/plan9.db

@@ -117,7 +117,7 @@
 386/bin/aux/mklatinkbd - 775 sys sys 1115950043 64179
 386/bin/aux/mnihongo - 775 sys sys 1115950044 139321
 386/bin/aux/mouse - 775 sys sys 1115950044 44026
-386/bin/aux/ms2 - 775 sys sys 1119496642 84323
+386/bin/aux/ms2 - 775 sys sys 1124335228 85677
 386/bin/aux/msexceltables - 775 sys sys 1116644791 81249
 386/bin/aux/mswordstrings - 775 sys sys 1115950044 65317
 386/bin/aux/na - 775 sys sys 1115950045 154186
@@ -224,7 +224,7 @@
 386/bin/faces - 775 sys sys 1115950068 193388
 386/bin/factor - 775 sys sys 1115950068 61475
 386/bin/fcp - 775 sys sys 1115950068 82162
-386/bin/file - 775 sys sys 1119496646 118863
+386/bin/file - 775 sys sys 1124335228 118879
 386/bin/fmt - 775 sys sys 1115950069 65301
 386/bin/fortune - 775 sys sys 1115950069 67136
 386/bin/fossil - 20000000775 sys sys 1042005470 0
@@ -362,7 +362,7 @@
 386/bin/ppm - 775 sys sys 1115950104 149347
 386/bin/pr - 775 sys sys 1115950104 77408
 386/bin/primes - 775 sys sys 1115950104 38793
-386/bin/prof - 775 sys sys 1119496655 107123
+386/bin/prof - 775 sys sys 1124335228 107945
 386/bin/proof - 775 sys sys 1115950105 178410
 386/bin/ps - 775 sys sys 1119496655 67994
 386/bin/pwd - 775 sys sys 1115950105 36897
@@ -427,7 +427,7 @@
 386/bin/topng - 775 sys sys 1115950121 138328
 386/bin/toppm - 775 sys sys 1115950121 165150
 386/bin/touch - 775 sys sys 1115950122 63763
-386/bin/tprof - 775 sys sys 1119496661 289288
+386/bin/tprof - 775 sys sys 1124335229 290189
 386/bin/tr - 775 sys sys 1115950123 61851
 386/bin/trace - 775 sys sys 1123123799 180764
 386/bin/troff - 775 sys sys 1116990553 357750
@@ -9547,7 +9547,7 @@ sys/src/cmd/aux/mnihongo/mkfile - 664 sys sys 944960789 95
 sys/src/cmd/aux/mnihongo/mnihongo.c - 664 sys sys 946759402 6406
 sys/src/cmd/aux/mnihongo/tmac.nihongo - 664 sys sys 944960789 22
 sys/src/cmd/aux/mouse.c - 664 sys sys 1063855425 7049
-sys/src/cmd/aux/ms2.c - 664 sys sys 1015008685 3129
+sys/src/cmd/aux/ms2.c - 664 sys sys 1124305056 3153
 sys/src/cmd/aux/msexceltables.c - 664 sys sys 1116594581 13722
 sys/src/cmd/aux/mswordstrings.c - 664 sys sys 952201344 5767
 sys/src/cmd/aux/na - 20000000775 sys sys 955036627 0
@@ -10019,7 +10019,7 @@ sys/src/cmd/fax/receiverc - 775 sys sys 944960990 581
 sys/src/cmd/fax/send.c - 664 sys sys 944960990 923
 sys/src/cmd/fax/subr.c - 664 sys sys 1015090401 1245
 sys/src/cmd/fcp.c - 664 sys sys 1110816880 3780
-sys/src/cmd/file.c - 664 sys sys 1113312632 23324
+sys/src/cmd/file.c - 664 sys sys 1124305142 23332
 sys/src/cmd/fmt.c - 664 sys sys 1070032009 4088
 sys/src/cmd/fortune.c - 664 sys sys 1072729222 1779
 sys/src/cmd/fossil - 20000000775 sys sys 1042005512 0
@@ -12603,7 +12603,7 @@ sys/src/cmd/postscript/trofftable/trofftable.rc - 664 sys sys 984789206 2637
 sys/src/cmd/postscript/trofftable/trofftable.sh - 664 sys sys 984789206 2613
 sys/src/cmd/pr.c - 664 sys sys 1050689592 11172
 sys/src/cmd/primes.c - 664 sys sys 944961351 2126
-sys/src/cmd/prof.c - 664 sys sys 1067718957 5521
+sys/src/cmd/prof.c - 664 sys sys 1124305301 5547
 sys/src/cmd/proof - 20000000775 sys sys 944961622 0
 sys/src/cmd/proof/font.c - 664 sys sys 944961621 8525
 sys/src/cmd/proof/htroff.c - 664 sys sys 955223407 10496
@@ -13002,7 +13002,7 @@ sys/src/cmd/time.c - 664 sys sys 1014926662 1546
 sys/src/cmd/tlsclient.c - 664 sys sys 1024375149 1631
 sys/src/cmd/tlssrv.c - 664 sys sys 1087829606 3411
 sys/src/cmd/touch.c - 664 sys sys 1099760670 899
-sys/src/cmd/tprof.c - 664 sys sys 1063858806 2716
+sys/src/cmd/tprof.c - 664 sys sys 1124305452 2731
 sys/src/cmd/tr.c - 664 sys sys 944961464 6008
 sys/src/cmd/trace.c - 664 sys sys 1121367076 17928
 sys/src/cmd/troff - 20000000775 sys sys 944961294 0

dist/replica/plan9.log

@@ -20807,3 +20807,11 @@
 1124229739 11 c sys/src/cmd/qi/mkfile - 664 sys sys 1124229161 298
 1124229739 12 c sys/src/cmd/qi/qi.c - 664 sys sys 1124229161 7867
 1124229739 13 c sys/src/cmd/qi/syscall.c - 664 sys sys 1124229161 14420
+1124305354 0 c sys/src/cmd/aux/ms2.c - 664 sys sys 1124305056 3153
+1124305354 1 c sys/src/cmd/file.c - 664 sys sys 1124305142 23332
+1124305354 2 c sys/src/cmd/prof.c - 664 sys sys 1124305301 5547
+1124305354 3 c sys/src/cmd/tprof.c - 664 sys sys 1124305452 2731
+1124335961 0 c 386/bin/file - 775 sys sys 1124335228 118879
+1124335961 1 c 386/bin/prof - 775 sys sys 1124335228 107945
+1124335961 2 c 386/bin/aux/ms2 - 775 sys sys 1124335228 85677
+1124335961 3 c 386/bin/tprof - 775 sys sys 1124335229 290189

sys/src/cmd/aux/ms2.c

@@ -3,9 +3,9 @@
 #include <bio.h>
 #include <mach.h>
 
-void	record(uchar*, int);
+void	record(uchar*, long);
 void	usage(void);
-void	segment(long, int);
+void	segment(vlong, vlong);
 
 enum
 {
@@ -17,7 +17,7 @@ int	supressend;
 int	binary;
 int	halfswap;
 int	srec = 2;
-ulong	addr;
+uvlong	addr;
 ulong 	psize = 4096;
 Biobuf 	stdout;
 Fhdr	exech;
@@ -27,7 +27,7 @@ void
 main(int argc, char **argv)
 {
 	Dir *dir;
-	ulong totsz;
+	uvlong totsz;
 
 	ARGBEGIN{
 	case 'd':
@@ -37,7 +37,7 @@ main(int argc, char **argv)
 		supressend++;
 		break;
 	case 'a':
-		addr = strtoul(ARGF(), 0, 0);
+		addr = strtoull(ARGF(), 0, 0);
 		break;
 	case 'p':
 		psize = strtoul(ARGF(), 0, 0);
@@ -91,7 +91,7 @@ main(int argc, char **argv)
 	}
 
 	totsz = exech.txtsz + exech.datsz + exech.bsssz;
-	fprint(2, "%s: %lud+%lud+%lud=%lud\n",
+	fprint(2, "%s: %lud+%lud+%lud=%llud\n",
 		exech.name, exech.txtsz, exech.datsz, exech.bsssz, totsz);
 
 	if(dsegonly)
@@ -120,9 +120,10 @@ main(int argc, char **argv)
 }
 
 void
-segment(long foff, int len)
+segment(vlong foff, vlong len)
 {
-	int l, n, i;
+	int i;
+	long l, n;
 	uchar t, buf[2*Recordsize];
 
 	Bseek(bio, foff, 0);
@@ -154,7 +155,7 @@ segment(long foff, int len)
 }
 
 void
-record(uchar *s, int l)
+record(uchar *s, long l)
 {
 	int i;
 	ulong cksum = 0;
@@ -162,20 +163,20 @@ record(uchar *s, int l)
 	switch(srec) {
 	case 1:
 		cksum = l+3;
-		Bprint(&stdout, "S1%.2X%.4luX", l+3, addr);
+		Bprint(&stdout, "S1%.2lX%.4lluX", l+3, addr);
 		cksum += addr&0xff;
 		cksum += (addr>>8)&0xff;
 		break;
 	case 2:
 		cksum = l+4;
-		Bprint(&stdout, "S2%.2X%.6luX", l+4, addr);
+		Bprint(&stdout, "S2%.2lX%.6lluX", l+4, addr);
 		cksum += addr&0xff;
 		cksum += (addr>>8)&0xff;
 		cksum += (addr>>16)&0xff;
 		break;
 	case 3:
 		cksum = l+5;
-		Bprint(&stdout, "S3%.2X%.8luX", l+5, addr);
+		Bprint(&stdout, "S3%.2lX%.8lluX", l+5, addr);
 		cksum += addr&0xff;
 		cksum += (addr>>8)&0xff;
 		cksum += (addr>>16)&0xff;

sys/src/cmd/file.c

@@ -1041,7 +1041,7 @@ depthof(char *s, int *newp)
 	if(s == es)
 		return -1;
 	if('0'<=*s && *s<='9')
-		return 1<<atoi(s);
+		return 1<<strtol(s, 0, 0);
 
 	*newp = 1;
 	d = 0;

sys/src/cmd/prof.c

@@ -55,8 +55,8 @@ main(int argc, char *argv[])
 	char *s;
 
 	s = getenv("tabstop");
-	if(s!=nil && atoi(s)>0)
-		tabstop = atoi(s);
+	if(s!=nil && strtol(s,0,0)>0)
+		tabstop = strtol(s,0,0);
 	ARGBEGIN{
 	case 'v':
 		verbose = 1;
@@ -182,7 +182,7 @@ name(ulong pc)
 
 	if (findsym(pc, CTEXT, &s))
 		return(s.name);
-	sprint(buf, "#%lux", pc);
+	snprint(buf, sizeof(buf), "#%lux", pc);
 	return buf;
 }
 

sys/src/cmd/tprof.c

@@ -78,10 +78,11 @@ main(int argc, char *argv[])
 	/*
 	 * Read timing data
 	 */
-	sprint(file, "/proc/%s/profile", argv[1]);
+	file = smprint("/proc/%s/profile", argv[1]);
 	fd = open(file, OREAD);
 	if(fd < 0)
 		error(1, file);
+	free(file);
 	d = dirfstat(fd);
 	if(d == nil)
 		error(1, "stat");