From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 17 Apr 2014 09:29:34 +0000 (+0200)
Subject: adjtimex: make its help text and printed data a bit less cryptic
X-Git-Tag: 1_23_0~131
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e152cb818903f219a641c03b7c3ef290ed39a49d;p=oweals%2Fbusybox.git

adjtimex: make its help text and printed data a bit less cryptic

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index c8816e9e7..534364a69 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -14,12 +14,12 @@
 //usage:#define adjtimex_trivial_usage
 //usage:       "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
 //usage:#define adjtimex_full_usage "\n\n"
-//usage:       "Read and optionally set system timebase parameters. See adjtimex(2)\n"
+//usage:       "Read or set kernel time variables. See adjtimex(2)\n"
 //usage:     "\n	-q	Quiet"
 //usage:     "\n	-o OFF	Time offset, microseconds"
 //usage:     "\n	-f FREQ	Frequency adjust, integer kernel units (65536 is 1ppm)"
-//usage:     "\n		(positive values make clock run faster)"
 //usage:     "\n	-t TICK	Microseconds per tick, usually 10000"
+//usage:     "\n		(positive -t or -f values make clock run faster)"
 //usage:     "\n	-p TCONST"
 
 #include "libbb.h"
@@ -111,13 +111,13 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
 	}
 
 	if (!(opt & OPT_quiet)) {
-		int sep;
+		const char *sep;
 		const char *name;
 
 		printf(
 			"    mode:         %d\n"
-			"-o  offset:       %ld\n"
-			"-f  frequency:    %ld\n"
+			"-o  offset:       %ld us\n"
+			"-f  freq.adjust:  %ld (65536 = 1ppm)\n"
 			"    maxerror:     %ld\n"
 			"    esterror:     %ld\n"
 			"    status:       %d (",
@@ -125,15 +125,14 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
 		txc.esterror, txc.status);
 
 		/* representative output of next code fragment:
-		   "PLL | PPSTIME" */
+		 * "PLL | PPSTIME"
+		 */
 		name = statlist_name;
-		sep = 0;
+		sep = "";
 		for (i = 0; statlist_bit[i]; i++) {
 			if (txc.status & statlist_bit[i]) {
-				if (sep)
-					fputs(" | ", stdout);
-				fputs(name, stdout);
-				sep = 1;
+				printf("%s%s", sep, name);
+				sep = " | ";
 			}
 			name += strlen(name) + 1;
 		}
@@ -143,9 +142,9 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
 			descript = nth_string(ret_code_descript, ret);
 		printf(")\n"
 			"-p  timeconstant: %ld\n"
-			"    precision:    %ld\n"
+			"    precision:    %ld us\n"
 			"    tolerance:    %ld\n"
-			"-t  tick:         %ld\n"
+			"-t  tick:         %ld us\n"
 			"    time.tv_sec:  %ld\n"
 			"    time.tv_usec: %ld\n"
 			"    return value: %d (%s)\n",