From: Ben Gras <ben@minix3.org>
Date: Fri, 12 Aug 2005 11:23:33 +0000 (+0000)
Subject: Al's window feature
X-Git-Tag: v3.1.0~358
X-Git-Url: http://zhaoyanbai.com/repos/nsupdate.html?a=commitdiff_plain;h=ea5c8d0318fc818de2ae35793c6e1a1c78297a34;p=minix.git

Al's window feature
---

diff --git a/commands/simple/progressbar.c b/commands/simple/progressbar.c
index a4405b138..a5c40a6b0 100755
--- a/commands/simple/progressbar.c
+++ b/commands/simple/progressbar.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
+#include <string.h>
 
 _PROTOTYPE(int main, (int argc, char **argv));
 
@@ -14,31 +15,31 @@ prettyprogress(long b, long maxb, time_t starttime)
   double bpsec;
   time(&now);
   spent = now - starttime;
+  printf("\r");	/* Make sure progress bar starts at beginning of line */
   if(spent > 0 && (bpsec = (double)b / spent) > 0) {
   	int len, i;
   	long secremain, minremain, hremain;
 	  secremain = (maxb - b) / bpsec;
 	  minremain = (secremain / 60) % 60;
 	  hremain = secremain / 3600;
-  	len = fprintf(stderr, "Remain %ld files. ", maxb-b);
+  	len = printf("Remainining: %ld files. ", maxb-b);
 
 #if 0
-  	len += fprintf(stderr, "ETA: %d:%02d:%02d ",
+  	len += printf("ETA: %d:%02d:%02d ",
   		hremain, minremain, secremain % 60);
 #endif
 
-	len += fprintf(stderr, " [");
+	len += printf(" [");
 
 #define WIDTH 77
   	len = WIDTH - len;
   	for(i = 0; i < (b * (len-1) / maxb); i++) 
-  		fprintf(stderr, "=");
- 	fprintf(stderr, "|");
+  		printf("=");
+ 	printf("|");
   	for(; i < len-2; i++) 
-  		fprintf(stderr, "-");
-  	fprintf(stderr, "]\r");
-  	fflush(stderr);
-  }
+  		printf("-");
+  	printf("]\n");
+  } else printf("\n");
 
   return;
 }
@@ -48,24 +49,29 @@ int argc;
 char *argv[];
 {
 	long i = 0, count = 0;
+	int l;
 	char line[2000];
 	time_t start;
 	if(argc < 2) return 1;
 	count = atol(argv[1]);
 	if(count < 1) return 1;
-	sync();
 	time(&start);
 	printf("\n");
+#define LINES 5
+	for(l = 1; l <= LINES+1; l++) printf("\n");
+	printf("");
+	sleep(1);
 	while(fgets(line, sizeof(line), stdin)) {
 		i++;
-		printf("%s", line);
+		for(l = 0; l <= LINES; l++)  printf("");
 		if(i <= count) prettyprogress(i, count, start);
-		else printf("\r");
-		printf("");
-		fflush(stdout);
+		else printf("\n");
+		printf("");
+		for(l = 0; l < LINES; l++)  printf("");
+		printf("\r%s", line);
 	}
 
-  	fprintf(stderr, "\nDone.\n");
+  	printf("\nDone.\n");
 
 	return 0;
 }