Plan 9 from Bell Labs 2005-10-04

dist/replica/_plan9.db

@@ -231,7 +231,7 @@
 386/bin/fossil/conf - 775 sys sys 1085077052 1506
 386/bin/fossil/flchk - 775 sys sys 1125345972 237504
 386/bin/fossil/flfmt - 775 sys sys 1125345973 245653
-386/bin/fossil/fossil - 775 sys sys 1119496648 360407
+386/bin/fossil/fossil - 775 sys sys 1128309083 360426
 386/bin/fossil/last - 775 sys sys 1115950071 63298
 386/bin/freq - 775 sys sys 1125345973 61793
 386/bin/fs - 20000000775 sys sys 954380769 0
@@ -245,8 +245,8 @@
 386/bin/fs/zipfs - 775 sys sys 1125345976 109079
 386/bin/ftpfs - 775 sys sys 1127360573 272753
 386/bin/games - 20000000775 sys sys 1096298711 0
-386/bin/games/4s - 775 sys sys 1120619353 177844
-386/bin/games/5s - 775 sys sys 1120619353 180356
+386/bin/games/4s - 775 sys sys 1128309084 177871
+386/bin/games/5s - 775 sys sys 1128309084 180159
 386/bin/games/catclock - 775 sys sys 1115950075 140798
 386/bin/games/juggle - 775 sys sys 1118202754 125319
 386/bin/games/jukebox - 775 sys sys 1105589128 264821
@@ -341,7 +341,7 @@
 386/bin/ndb/mkhosts - 775 sys sys 1125346000 84954
 386/bin/ndb/query - 775 sys sys 1125346000 83041
 386/bin/netkey - 775 sys sys 1115950098 72307
-386/bin/netstat - 775 sys sys 1125346001 84376
+386/bin/netstat - 775 sys sys 1128309084 84664
 386/bin/news - 775 sys sys 1125346001 71660
 386/bin/nfs - 775 sys sys 1125346002 315509
 386/bin/nm - 775 sys sys 1125346002 121794
@@ -6118,7 +6118,7 @@ sys/lib/dist/bin/386 - 20000000775 sys sys 1018720418 0
 sys/lib/dist/cdstub - 20000000555 sys sys 1018640690 0
 sys/lib/dist/cdstub/bootdisk.img - 664 sys sys 1019324215 0
 sys/lib/dist/cmd - 20000000775 sys sys 1018641008 0
-sys/lib/dist/cmd/bargraph.c - 664 sys sys 1114364700 5871
+sys/lib/dist/cmd/bargraph.c - 664 sys sys 1128338667 5951
 sys/lib/dist/cmd/bflz.c - 664 sys sys 1033073375 6115
 sys/lib/dist/cmd/bzfs - 20000000775 sys sys 1018641007 0
 sys/lib/dist/cmd/bzfs/bzfs.h - 664 sys sys 1018469727 223
@@ -14974,7 +14974,3 @@ 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/games/4s - 775 sys sys 1128309084 177871
-386/bin/games/5s - 775 sys sys 1128309084 180159
-386/bin/netstat - 775 sys sys 1128309084 84664
-386/bin/fossil/fossil - 775 sys sys 1128309083 360426

dist/replica/plan9.db

@@ -6118,7 +6118,7 @@ sys/lib/dist/bin/386 - 20000000775 sys sys 1018720418 0
 sys/lib/dist/cdstub - 20000000555 sys sys 1018640690 0
 sys/lib/dist/cdstub/bootdisk.img - 664 sys sys 1019324215 0
 sys/lib/dist/cmd - 20000000775 sys sys 1018641008 0
-sys/lib/dist/cmd/bargraph.c - 664 sys sys 1114364700 5871
+sys/lib/dist/cmd/bargraph.c - 664 sys sys 1128338667 5951
 sys/lib/dist/cmd/bflz.c - 664 sys sys 1033073375 6115
 sys/lib/dist/cmd/bzfs - 20000000775 sys sys 1018641007 0
 sys/lib/dist/cmd/bzfs/bzfs.h - 664 sys sys 1018469727 223

dist/replica/plan9.log

@@ -21541,3 +21541,4 @@
 1128310238 1 c 386/bin/games/5s - 775 sys sys 1128309084 180159
 1128310238 2 c 386/bin/netstat - 775 sys sys 1128309084 84664
 1128310238 3 c 386/bin/fossil/fossil - 775 sys sys 1128309083 360426
+1128339045 0 c sys/lib/dist/cmd/bargraph.c - 664 sys sys 1128338667 5951

sys/lib/dist/cmd/bargraph.c

@@ -30,7 +30,7 @@ Rectangle rbar;
 Point ptext;
 vlong n, d;
 int last;
-int lastp;
+int lastp = -1;
 int first = 1;
 
 char backup[80];
@@ -40,7 +40,8 @@ drawbar(void)
 {
 	int i, j;
 	int p;
-	char buf[10], bar[100];
+	char buf[200], bar[100], *s;
+	static char lastbar[100];
 
 	if(n > d || n < 0 || d <= 0)
 		return;
@@ -48,9 +49,6 @@ drawbar(void)
 	i = (Dx(rbar)*n)/d;
 	p = (n*100LL)/d;
 
-	if(lastp == p && last == i)
-		return;
-
 	if(textmode){
 		bar[0] = '|';
 		for(j=0; j<i; j++)
@@ -59,20 +57,20 @@ drawbar(void)
 			bar[j+1] = '-';
 		bar[61] = '|';
 		bar[62] = ' ';
-		sprint(bar+63, "%3d%%", p);
-		if(first)
-			first = 0;
-		else{
-			for(i=0; i<strlen(bar); i++)
-				backup[i] = '\b';
-			write(1, backup, i);
-		}
-		write(1, bar, strlen(bar));
-		lastp = p;
-		last = i;
+		sprint(bar+63, "%3d%% ", p);
+		for(i=0; bar[i]==lastbar[i] && bar[i]; i++)
+			;
+		memset(buf, '\b', strlen(lastbar)-i);
+		strcpy(buf+strlen(lastbar)-i, bar+i);
+		if(buf[0])
+			write(1, buf, strlen(buf));
+		strcpy(lastbar, bar);
 		return;
 	}
-		
+	
+	if(lastp == p && last == i)
+		return;
+
 	if(lastp != p){
 		sprint(buf, "%d%%", p);
 		
@@ -220,7 +218,7 @@ rdenv(char *name)
 	size = seek(fd, 0, 2);
 	v = malloc(size+1);
 	if(v == 0){
-		fprint(2, "page: can't malloc: %r\n");
+		fprint(2, "%s: can't malloc: %r\n", argv0);
 		exits("no mem");
 	}
 	seek(fd, 0, 0);
@@ -303,11 +301,11 @@ screenrect(void)
 	if(fd == -1)
 		fd=open("/mnt/term/dev/screen", OREAD);
 	if(fd == -1){
-		fprint(2, "page: can't open /dev/screen: %r\n");
+		fprint(2, "%s: can't open /dev/screen: %r\n", argv0);
 		exits("window read");
 	}
 	if(read(fd, buf, sizeof buf) != sizeof buf){
-		fprint(2, "page: can't read /dev/screen: %r\n");
+		fprint(2, "%s: can't read /dev/screen: %r\n", argv0);
 		exits("screen read");
 	}
 	close(fd);