diff options
author | wollman <wollman@FreeBSD.org> | 1994-02-03 22:09:07 +0000 |
---|---|---|
committer | wollman <wollman@FreeBSD.org> | 1994-02-03 22:09:07 +0000 |
commit | 394ee3bae890775188c4812249fc996cb7cc0abe (patch) | |
tree | 6264e1a9edb32ef88fffee8f460175549f1b556f /usr.sbin/xntpd/util | |
parent | 8e51e9f1429efc498f923bce8b25b20f47d7c075 (diff) | |
download | FreeBSD-src-394ee3bae890775188c4812249fc996cb7cc0abe.zip FreeBSD-src-394ee3bae890775188c4812249fc996cb7cc0abe.tar.gz |
xntpd version 3.3z from UDel
Diffstat (limited to 'usr.sbin/xntpd/util')
-rw-r--r-- | usr.sbin/xntpd/util/Makefile.tmpl | 2 | ||||
-rw-r--r-- | usr.sbin/xntpd/util/ntptime.c | 22 | ||||
-rw-r--r-- | usr.sbin/xntpd/util/tickadj.c | 31 |
3 files changed, 26 insertions, 29 deletions
diff --git a/usr.sbin/xntpd/util/Makefile.tmpl b/usr.sbin/xntpd/util/Makefile.tmpl index 1115ef8..be1681f 100644 --- a/usr.sbin/xntpd/util/Makefile.tmpl +++ b/usr.sbin/xntpd/util/Makefile.tmpl @@ -32,7 +32,7 @@ EXECS= ntptime jitter timetrim kern byteorder longsize precision all: $(PROGRAM) tickadj: $(TKOBJS) - $(CC) $(COPTS) -o $@ $(TKOBJS) $(DAEMONLIBS) $(RESLIB) $(COMPAT) + $(CC) $(COPTS) -o $@ $(TKOBJS) $(LIB) $(DAEMONLIBS) $(RESLIB) $(COMPAT) ntptime: $(NTOBJS) $(CC) $(COPTS) -o $@ $(NTOBJS) $(LIB) diff --git a/usr.sbin/xntpd/util/ntptime.c b/usr.sbin/xntpd/util/ntptime.c index e528802..c0512df 100644 --- a/usr.sbin/xntpd/util/ntptime.c +++ b/usr.sbin/xntpd/util/ntptime.c @@ -37,7 +37,6 @@ extern int sigvec P((int, struct sigvec *, struct sigvec *)); void pll_trap P((void)); -extern int getopt_l P((int, char **, char *)); static struct sigvec newsigsys; /* new sigvec status */ static struct sigvec sigsys; /* current sigvec status */ @@ -51,8 +50,8 @@ main(argc, argv) int argc; char *argv[]; { - extern int optind; - extern char *optarg; + extern int ntp_optind; + extern char *ntp_optarg; int status; struct ntptimeval ntv; struct timex ntx, _ntx; @@ -66,46 +65,47 @@ main(argc, argv) ntx.mode = 0; progname = argv[0]; - while ((c = getopt_l(argc, argv, optargs)) != EOF) switch (c) { + while ((c = ntp_getopt(argc, argv, optargs)) != EOF) switch (c) { case 'c': cost++; break; case 'e': ntx.mode |= ADJ_ESTERROR; - ntx.esterror = atoi(optarg); + ntx.esterror = atoi(ntp_optarg); break; case 'f': ntx.mode |= ADJ_FREQUENCY; - ntx.frequency = (int) (atof(optarg) * (1 << SHIFT_USEC)); + ntx.frequency = (int) (atof(ntp_optarg) + * (1 << SHIFT_USEC)); if (ntx.frequency < (-100 << SHIFT_USEC) || ntx.frequency > ( 100 << SHIFT_USEC)) errflg++; break; case 'm': ntx.mode |= ADJ_MAXERROR; - ntx.maxerror = atoi(optarg); + ntx.maxerror = atoi(ntp_optarg); break; case 'o': ntx.mode |= ADJ_OFFSET; - ntx.offset = atoi(optarg); + ntx.offset = atoi(ntp_optarg); break; case 'r': rawtime++; break; case 's': ntx.mode |= ADJ_STATUS; - ntx.status = atoi(optarg); + ntx.status = atoi(ntp_optarg); if (ntx.status < 0 || ntx.status > 4) errflg++; break; case 't': ntx.mode |= ADJ_TIMECONST; - ntx.time_constant = atoi(optarg); + ntx.time_constant = atoi(ntp_optarg); if (ntx.time_constant < 0 || ntx.time_constant > MAXTC) errflg++; break; default: errflg++; } - if (errflg || (optind != argc)) { + if (errflg || (ntp_optind != argc)) { (void) fprintf(stderr, "usage: %s [-%s]\n\n\ -c display the time taken to call ntp_gettime (us)\n\ diff --git a/usr.sbin/xntpd/util/tickadj.c b/usr.sbin/xntpd/util/tickadj.c index da18e06..ab10b37 100644 --- a/usr.sbin/xntpd/util/tickadj.c +++ b/usr.sbin/xntpd/util/tickadj.c @@ -61,9 +61,6 @@ static char * getoffsets P((char *, unsigned long *, unsigned long *, unsigned l static int openfile P((char *, int)); static void writevar P((int, unsigned long, int)); static void readvar P((int, unsigned long, int *)); -#ifndef NTP_POSIX_SOURCE -extern int getopt P((int, char **, char *)); -#endif /* * main - parse arguments and handle options @@ -75,8 +72,8 @@ char *argv[]; { int c; int errflg = 0; - extern int optind; - extern char *optarg; + extern int ntp_optind; + extern char *ntp_optarg; unsigned long tickadj_offset; unsigned long tick_offset; unsigned long dosync_offset; @@ -94,7 +91,7 @@ char *argv[]; void writevar(); progname = argv[0]; - while ((c = getopt(argc, argv, "a:Adkqpst:")) != EOF) + while ((c = ntp_getopt(argc, argv, "a:Adkqpst:")) != EOF) switch (c) { case 'd': ++debug; @@ -109,11 +106,11 @@ char *argv[]; quiet = 1; break; case 'a': - writetickadj = atoi(optarg); + writetickadj = atoi(ntp_optarg); if (writetickadj <= 0) { (void) fprintf(stderr, "%s: unlikely value for tickadj: %s\n", - progname, optarg); + progname, ntp_optarg); errflg++; } break; @@ -124,11 +121,11 @@ char *argv[]; unsetdosync = 1; break; case 't': - writetick = atoi(optarg); + writetick = atoi(ntp_optarg); if (writetick <= 0) { (void) fprintf(stderr, "%s: unlikely value for tick: %s\n", - progname, optarg); + progname, ntp_optarg); errflg++; } break; @@ -136,7 +133,7 @@ char *argv[]; errflg++; break; } - if (errflg || optind != argc) { + if (errflg || ntp_optind != argc) { (void) fprintf(stderr, "usage: %s [-Aqsp] [-a newadj] [-t newtick]\n", progname); exit(2); @@ -154,25 +151,25 @@ char *argv[]; if (setnoprintf && (noprintf_offset == 0)) { (void) fprintf(stderr, "No noprintf kernal variable\n"); - exit(1); + errflg++; } if (unsetdosync && (dosync_offset == 0)) { (void) fprintf(stderr, "No dosynctodr kernal variable\n"); - exit(1); + errflg++; } if (writeopttickadj && (tickadj_offset == 0)) { (void) fprintf(stderr, "No tickadj kernal variable\n"); - exit(1); + errflg++; } if (writetick && (tick_offset == 0)) { (void) fprintf(stderr, "No tick kernal variable\n"); - exit(1); + errflg++; } @@ -234,7 +231,7 @@ char *argv[]; if (writetickadj == 0 && !writeopttickadj && !unsetdosync && writetick == 0 && !setnoprintf) - exit(0); + exit(errflg ? 1 : 0); if (writetickadj == 0 && writeopttickadj) writetickadj = recommend_tickadj; @@ -283,7 +280,7 @@ char *argv[]; (void) fprintf(stderr, "done!\n"); } (void) close(fd); - exit(0); + exit(errflg ? 1 : 0); } /* |