Added adjtimex applet from Larry Doolittle.

8 files changed, 384 insertions, 0 deletions

diff --git a/Config.h b/Config.h
index 171385420..9022dd075 100644
--- a/Config.h
+++ b/Config.h
@@ -7,6 +7,7 @@
 //
 //
 // BusyBox Applications
+//#define BB_ADJTIMEX
 //#define BB_AR
 #define BB_BASENAME
 #define BB_CAT
diff --git a/adjtimex.c b/adjtimex.c
new file mode 100644
index 000000000..02b6e89b0
--- /dev/null
+++ b/adjtimex.c
@@ -0,0 +1,169 @@
+/*
+ * adjtimex.c - read, and possibly modify, the Linux kernel `timex' variables.
+ *
+ * Originally written: October 1997
+ * Last hack: March 2001
+ * Copyright 1997, 2000, 2001 Larry Doolittle <LRDoolittle@lbl.gov>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License (Version 2,
+ *  June 1991) as published by the Free Software Foundation.  At the
+ *  time of writing, that license was published by the FSF with the URL
+ *  http://www.gnu.org/copyleft/gpl.html, and is incorporated herein by
+ *  reference.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ * This adjtimex(1) is very similar in intent to adjtimex(8) by Steven
+ * Dick <ssd@nevets.oau.org> and Jim Van Zandt <jrv@vanzandt.mv.com>
+ * (see http://metalab.unc.edu/pub/Linux/system/admin/time/adjtimex*).
+ * That version predates this one, and is _much_ bigger and more
+ * featureful.  My independently written version was very similar to
+ * Steven's from the start, because they both follow the kernel timex
+ * structure.  I further tweaked this version to be equivalent to Steven's
+ * where possible, but I don't like getopt_long, so the actual usage
+ * syntax is incompatible.
+ *
+ * Amazingly enough, my Red Hat 5.2 sys/timex (and sub-includes)
+ * don't actually give a prototype for adjtimex(2), so building
+ * this code (with -Wall) gives a warning.  Later versions of
+ * glibc fix this issue.
+ *
+ * This program is too simple for a Makefile, just build with:
+ *  gcc -Wall -O adjtimex.c -o adjtimex
+ *
+ * busyboxed 20 March 2001, Larry Doolittle <ldoolitt@recycle.lbl.gov>
+ * It will autosense if it is built in a busybox environment, based
+ * on the BB_VER preprocessor macro.
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/timex.h>
+#ifdef BB_VER
+#include "busybox.h"
+#endif
+
+static struct {int bit; char *name;} statlist[] = {
+	{ STA_PLL,       "PLL"       },
+	{ STA_PPSFREQ,   "PPSFREQ"   },
+	{ STA_PPSTIME,   "PPSTIME"   },
+	{ STA_FLL,       "FFL"       },
+	{ STA_INS,       "INS"       },
+	{ STA_DEL,       "DEL"       },
+	{ STA_UNSYNC,    "UNSYNC"    },
+	{ STA_FREQHOLD,  "FREQHOLD"  },
+	{ STA_PPSSIGNAL, "PPSSIGNAL" },
+	{ STA_PPSJITTER, "PPSJITTER" },
+	{ STA_PPSWANDER, "PPSWANDER" },
+	{ STA_PPSERROR,  "PPSERROR"  },
+	{ STA_CLOCKERR,  "CLOCKERR"  },
+	{ 0, NULL } };
+
+static char *ret_code_descript[] = {
+	"clock synchronized",
+	"insert leap second",
+	"delete leap second",
+	"leap second in progress",
+	"leap second has occurred",
+	"clock not synchronized" };
+
+#ifdef BB_VER
+#define main adjtimex_main
+#else
+void usage(char *prog)
+{
+	fprintf(stderr, 
+		"Usage: %s [ -q ] [ -o offset ] [ -f frequency ] [ -p timeconstant ] [ -t tick ]\n",
+		prog);
+}
+#define show_usage() usage(argv[0])
+#endif
+
+int main(int argc, char ** argv)
+{
+	struct timex txc;
+	int quiet=0;
+	int c, i, ret, sep;
+	char *descript;
+	txc.modes=0;
+	for (;;) {
+		c = getopt( argc, argv, "qo:f:p:t:");
+		if (c == EOF) break;
+		switch (c) {
+			case 'q':
+				quiet=1;
+				break;
+			case 'o':
+				txc.offset = atoi(optarg);
+				txc.modes |= ADJ_OFFSET_SINGLESHOT;
+				break;
+			case 'f':
+				txc.freq = atoi(optarg);
+				txc.modes |= ADJ_FREQUENCY;
+				break;
+			case 'p':
+				txc.constant = atoi(optarg);
+				txc.modes |= ADJ_TIMECONST;
+				break;
+			case 't':
+				txc.tick = atoi(optarg);
+				txc.modes |= ADJ_TICK;
+				break;
+			default:
+				show_usage();
+				exit(1);
+		}
+	}
+	if (argc != optind) { /* no valid non-option parameters */
+		show_usage();
+		exit(1);
+	}
+
+	ret = adjtimex(&txc);
+
+	if (ret < 0) perror("adjtimex");
+	
+	if (!quiet && ret>=0) {
+		printf(
+			"    mode:         %d\n"
+			"-o  offset:       %ld\n"
+			"-f  frequency:    %ld\n"
+			"    maxerror:     %ld\n"
+			"    esterror:     %ld\n"
+			"    status:       %d ( ",
+		txc.modes, txc.offset, txc.freq, txc.maxerror,
+		txc.esterror, txc.status);
+
+		/* representative output of next code fragment:
+		   "PLL | PPSTIME" */
+		sep=0;
+		for (i=0; statlist[i].name; i++) {
+			if (txc.status & statlist[i].bit) {
+				if (sep) fputs(" | ",stdout);
+				fputs(statlist[i].name,stdout);
+				sep=1;
+			}
+		}
+
+		descript = "error";
+		if (ret >= 0 && ret <= 5) descript = ret_code_descript[ret];
+		printf(" )\n"
+			"-p  timeconstant: %ld\n"
+			"    precision:    %ld\n"
+			"    tolerance:    %ld\n"
+			"-t  tick:         %ld\n"
+			"    time.tv_sec:  %ld\n"
+			"    time.tv_usec: %ld\n"
+			"    return value: %d (%s)\n",
+		txc.constant,
+		txc.precision, txc.tolerance, txc.tick,
+		txc.time.tv_sec, txc.time.tv_usec, ret, descript);
+	}
+	return (ret<0);
+}
diff --git a/applets.h b/applets.h
index 8c59507ce..2af2b49e7 100644
--- a/applets.h
+++ b/applets.h
@@ -46,6 +46,9 @@
 #ifdef BB_TEST
 	APPLET_NOUSAGE("[", test_main, _BB_DIR_USR_BIN)
 #endif
+#ifdef BB_ADJTIMEX
+	APPLET(adjtimex, adjtimex_main, _BB_DIR_SBIN)
+#endif
 #ifdef BB_AR
 	APPLET(ar, ar_main, _BB_DIR_USR_BIN)
 #endif
diff --git a/applets/usage.h b/applets/usage.h
index dc3b49816..8ec0170e2 100644
--- a/applets/usage.h
+++ b/applets/usage.h
@@ -1,3 +1,16 @@
+#define adjtimex_trivial_usage \
+	"[-q] [-o offset] [-f frequency] [-p timeconstant] [-t tick]"
+#define adjtimex_full_usage \
+	"Reads and optionally sets system timebase parameters.\n" \
+	"See adjtimex(2).\n\n" \
+	"Options:\n" \
+	"\t-q\t\tquiet mode - do not print\n" \
+	"\t-o offset\ttime offset, microseconds\n" \
+	"\t-f frequency\tfrequency adjust, integer kernel units (65536 is 1ppm)\n" \
+	"\t\t\t(positive values make the system clock run fast)\n" \
+	"\t-t tick\t\tmicroseconds per tick, usually 10000\n" \
+	"\t-p timeconstant\n"
+
 #define ar_trivial_usage \
 	"-[ovR]{ptx} archive filenames"
 #define ar_full_usage \
diff --git a/include/applets.h b/include/applets.h
index 8c59507ce..2af2b49e7 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -46,6 +46,9 @@
 #ifdef BB_TEST
 	APPLET_NOUSAGE("[", test_main, _BB_DIR_USR_BIN)
 #endif
+#ifdef BB_ADJTIMEX
+	APPLET(adjtimex, adjtimex_main, _BB_DIR_SBIN)
+#endif
 #ifdef BB_AR
 	APPLET(ar, ar_main, _BB_DIR_USR_BIN)
 #endif
diff --git a/include/usage.h b/include/usage.h
index dc3b49816..8ec0170e2 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1,3 +1,16 @@
+#define adjtimex_trivial_usage \
+	"[-q] [-o offset] [-f frequency] [-p timeconstant] [-t tick]"
+#define adjtimex_full_usage \
+	"Reads and optionally sets system timebase parameters.\n" \
+	"See adjtimex(2).\n\n" \
+	"Options:\n" \
+	"\t-q\t\tquiet mode - do not print\n" \
+	"\t-o offset\ttime offset, microseconds\n" \
+	"\t-f frequency\tfrequency adjust, integer kernel units (65536 is 1ppm)\n" \
+	"\t\t\t(positive values make the system clock run fast)\n" \
+	"\t-t tick\t\tmicroseconds per tick, usually 10000\n" \
+	"\t-p timeconstant\n"
+
 #define ar_trivial_usage \
 	"-[ovR]{ptx} archive filenames"
 #define ar_full_usage \
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
new file mode 100644
index 000000000..02b6e89b0
--- /dev/null
+++ b/miscutils/adjtimex.c
@@ -0,0 +1,169 @@
+/*
+ * adjtimex.c - read, and possibly modify, the Linux kernel `timex' variables.
+ *
+ * Originally written: October 1997
+ * Last hack: March 2001
+ * Copyright 1997, 2000, 2001 Larry Doolittle <LRDoolittle@lbl.gov>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License (Version 2,
+ *  June 1991) as published by the Free Software Foundation.  At the
+ *  time of writing, that license was published by the FSF with the URL
+ *  http://www.gnu.org/copyleft/gpl.html, and is incorporated herein by
+ *  reference.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ * This adjtimex(1) is very similar in intent to adjtimex(8) by Steven
+ * Dick <ssd@nevets.oau.org> and Jim Van Zandt <jrv@vanzandt.mv.com>
+ * (see http://metalab.unc.edu/pub/Linux/system/admin/time/adjtimex*).
+ * That version predates this one, and is _much_ bigger and more
+ * featureful.  My independently written version was very similar to
+ * Steven's from the start, because they both follow the kernel timex
+ * structure.  I further tweaked this version to be equivalent to Steven's
+ * where possible, but I don't like getopt_long, so the actual usage
+ * syntax is incompatible.
+ *
+ * Amazingly enough, my Red Hat 5.2 sys/timex (and sub-includes)
+ * don't actually give a prototype for adjtimex(2), so building
+ * this code (with -Wall) gives a warning.  Later versions of
+ * glibc fix this issue.
+ *
+ * This program is too simple for a Makefile, just build with:
+ *  gcc -Wall -O adjtimex.c -o adjtimex
+ *
+ * busyboxed 20 March 2001, Larry Doolittle <ldoolitt@recycle.lbl.gov>
+ * It will autosense if it is built in a busybox environment, based
+ * on the BB_VER preprocessor macro.
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/timex.h>
+#ifdef BB_VER
+#include "busybox.h"
+#endif
+
+static struct {int bit; char *name;} statlist[] = {
+	{ STA_PLL,       "PLL"       },
+	{ STA_PPSFREQ,   "PPSFREQ"   },
+	{ STA_PPSTIME,   "PPSTIME"   },
+	{ STA_FLL,       "FFL"       },
+	{ STA_INS,       "INS"       },
+	{ STA_DEL,       "DEL"       },
+	{ STA_UNSYNC,    "UNSYNC"    },
+	{ STA_FREQHOLD,  "FREQHOLD"  },
+	{ STA_PPSSIGNAL, "PPSSIGNAL" },
+	{ STA_PPSJITTER, "PPSJITTER" },
+	{ STA_PPSWANDER, "PPSWANDER" },
+	{ STA_PPSERROR,  "PPSERROR"  },
+	{ STA_CLOCKERR,  "CLOCKERR"  },
+	{ 0, NULL } };
+
+static char *ret_code_descript[] = {
+	"clock synchronized",
+	"insert leap second",
+	"delete leap second",
+	"leap second in progress",
+	"leap second has occurred",
+	"clock not synchronized" };
+
+#ifdef BB_VER
+#define main adjtimex_main
+#else
+void usage(char *prog)
+{
+	fprintf(stderr, 
+		"Usage: %s [ -q ] [ -o offset ] [ -f frequency ] [ -p timeconstant ] [ -t tick ]\n",
+		prog);
+}
+#define show_usage() usage(argv[0])
+#endif
+
+int main(int argc, char ** argv)
+{
+	struct timex txc;
+	int quiet=0;
+	int c, i, ret, sep;
+	char *descript;
+	txc.modes=0;
+	for (;;) {
+		c = getopt( argc, argv, "qo:f:p:t:");
+		if (c == EOF) break;
+		switch (c) {
+			case 'q':
+				quiet=1;
+				break;
+			case 'o':
+				txc.offset = atoi(optarg);
+				txc.modes |= ADJ_OFFSET_SINGLESHOT;
+				break;
+			case 'f':
+				txc.freq = atoi(optarg);
+				txc.modes |= ADJ_FREQUENCY;
+				break;
+			case 'p':
+				txc.constant = atoi(optarg);
+				txc.modes |= ADJ_TIMECONST;
+				break;
+			case 't':
+				txc.tick = atoi(optarg);
+				txc.modes |= ADJ_TICK;
+				break;
+			default:
+				show_usage();
+				exit(1);
+		}
+	}
+	if (argc != optind) { /* no valid non-option parameters */
+		show_usage();
+		exit(1);
+	}
+
+	ret = adjtimex(&txc);
+
+	if (ret < 0) perror("adjtimex");
+	
+	if (!quiet && ret>=0) {
+		printf(
+			"    mode:         %d\n"
+			"-o  offset:       %ld\n"
+			"-f  frequency:    %ld\n"
+			"    maxerror:     %ld\n"
+			"    esterror:     %ld\n"
+			"    status:       %d ( ",
+		txc.modes, txc.offset, txc.freq, txc.maxerror,
+		txc.esterror, txc.status);
+
+		/* representative output of next code fragment:
+		   "PLL | PPSTIME" */
+		sep=0;
+		for (i=0; statlist[i].name; i++) {
+			if (txc.status & statlist[i].bit) {
+				if (sep) fputs(" | ",stdout);
+				fputs(statlist[i].name,stdout);
+				sep=1;
+			}
+		}
+
+		descript = "error";
+		if (ret >= 0 && ret <= 5) descript = ret_code_descript[ret];
+		printf(" )\n"
+			"-p  timeconstant: %ld\n"
+			"    precision:    %ld\n"
+			"    tolerance:    %ld\n"
+			"-t  tick:         %ld\n"
+			"    time.tv_sec:  %ld\n"
+			"    time.tv_usec: %ld\n"
+			"    return value: %d (%s)\n",
+		txc.constant,
+		txc.precision, txc.tolerance, txc.tick,
+		txc.time.tv_sec, txc.time.tv_usec, ret, descript);
+	}
+	return (ret<0);
+}
diff --git a/usage.h b/usage.h
index dc3b49816..8ec0170e2 100644
--- a/usage.h
+++ b/usage.h
@@ -1,3 +1,16 @@
+#define adjtimex_trivial_usage \
+	"[-q] [-o offset] [-f frequency] [-p timeconstant] [-t tick]"
+#define adjtimex_full_usage \
+	"Reads and optionally sets system timebase parameters.\n" \
+	"See adjtimex(2).\n\n" \
+	"Options:\n" \
+	"\t-q\t\tquiet mode - do not print\n" \
+	"\t-o offset\ttime offset, microseconds\n" \
+	"\t-f frequency\tfrequency adjust, integer kernel units (65536 is 1ppm)\n" \
+	"\t\t\t(positive values make the system clock run fast)\n" \
+	"\t-t tick\t\tmicroseconds per tick, usually 10000\n" \
+	"\t-p timeconstant\n"
+
 #define ar_trivial_usage \
 	"-[ovR]{ptx} archive filenames"
 #define ar_full_usage \