From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Fri, 27 Oct 2006 09:34:22 +0000 (-0000)
Subject: top: batch mode should output all processes
X-Git-Tag: 1_4_0~454
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=25d806212806b5077a38777aaf8d5c622a8b9dd9;p=oweals%2Fbusybox.git

top: batch mode should output all processes
---

diff --git a/procps/top.c b/procps/top.c
index 06a84c90c..d58fdda97 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -224,14 +224,12 @@ static unsigned long display_generic(int scr_width)
 	fclose(fp);
 
 	/* read load average as a string */
-	fp = xfopen("loadavg", "r");
 	buf[0] = '\0';
-	fgets(buf, sizeof(buf), fp);
+	open_read_close("loadavg", buf, sizeof(buf));
 	end = strchr(buf, ' ');
 	if (end) end = strchr(end+1, ' ');
 	if (end) end = strchr(end+1, ' ');
 	if (end) *end = '\0';
-	fclose(fp);
 
 	if (needs_conversion) {
 		/* convert to kilobytes */
@@ -253,8 +251,7 @@ static unsigned long display_generic(int scr_width)
 
 	printf(OPT_BATCH_MODE ? "%s\n" : "\e[H\e[J%s\n", scrbuf);
     
-	snprintf(scrbuf, scr_width,
-		"Load average: %s", buf);
+	snprintf(scrbuf, scr_width, "Load average: %s", buf);
 	printf("%s\n", scrbuf);
 
 	return total;
@@ -321,7 +318,6 @@ static void display_status(int count, int scr_width)
 	}
 	/* printf(" pmem_scale=%u pcpu_scale=%u ", pmem_scale, pcpu_scale); */
 #endif
-	if (OPT_BATCH_MODE) count--;
 	while (count-- > 0) {
 		div_t pmem = div((s->rss*pmem_scale) >> pmem_shift, 10);
 		int col = scr_width+1;
@@ -337,7 +333,7 @@ static void display_status(int count, int scr_width)
 				s->pid, s->user, s->state, rss_str_buf, s->ppid,
 				USE_FEATURE_TOP_CPU_USAGE_PERCENTAGE(pcpu.quot, '0'+pcpu.rem,)
 				pmem.quot, '0'+pmem.rem);
-		if (col>0)
+		if (col > 0)
 			printf("%.*s", col, s->short_cmd);
 		/* printf(" %d/%d %lld/%lld", s->pcpu, total_pcpu,
 			jif.busy - prev_jif.busy, jif.total - prev_jif.total); */
@@ -463,7 +459,7 @@ int top_main(int argc, char **argv)
 		qsort(top, ntop, sizeof(procps_status_t), (void*)sort_function);
 #endif /* CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE */
 		count = lines;
-		if (count > ntop) {
+		if (OPT_BATCH_MODE || count > ntop) {
 			count = ntop;
 		}
 		/* show status for each of the processes */
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index adfd4d698..4749c1bd8 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -2277,7 +2277,7 @@ add_partition(int n, int sys)
 		if (start > limit)
 			break;
 		if (start >= temp+units_per_sector && num_read) {
-			printf(_("Sector %llu is already allocated\n"), (unsigned long long)temp);
+			printf(_("Sector "OFF_T_FMT" is already allocated\n"), temp);
 			temp = start;
 			num_read = 0;
 		}