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/ntpq | |
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/ntpq')
-rw-r--r-- | usr.sbin/xntpd/ntpq/ntpq.c | 50 | ||||
-rw-r--r-- | usr.sbin/xntpd/ntpq/ntpq_ops.c | 19 |
2 files changed, 37 insertions, 32 deletions
diff --git a/usr.sbin/xntpd/ntpq/ntpq.c b/usr.sbin/xntpd/ntpq/ntpq.c index e9db008..5cfc3da 100644 --- a/usr.sbin/xntpd/ntpq/ntpq.c +++ b/usr.sbin/xntpd/ntpq/ntpq.c @@ -301,7 +301,7 @@ static int decodereach P((char *, U_LONG *)); static int decodearr P((char *, int *, l_fp *)); static char * getcode P((int, struct codestring *)); static void help P((struct parse *, FILE *)); -#if defined(sgi) +#if defined(sgi) || defined(SYS_BSDI) static int helpsort P((const void *, const void *)); #else static int helpsort P((char **, char **)); @@ -335,11 +335,11 @@ static void output P((FILE *, char *, char *)); static void endoutput P((FILE *)); static void outputarr P((FILE *, char *, int, l_fp *)); static void cookedprint P((int, int, char *, int, FILE *)); -#if defined(sgi) +#if defined(sgi) || defined(SYS_BSDI) static int assoccmp P((const void *, const void *)); #else static int assoccmp P((struct association *, struct association *)); -#endif /* sgi */ +#endif /* sgi || bsdi */ /* @@ -509,17 +509,17 @@ char *argv[]; { int c; int errflg = 0; - extern int optind; - extern char *optarg; + extern int ntp_optind; + extern char *ntp_optarg; delay_time.l_ui = 0; delay_time.l_uf = DEFDELAY; progname = argv[0]; - while ((c = getopt_l(argc, argv, "c:dinp")) != EOF) + while ((c = ntp_getopt(argc, argv, "c:dinp")) != EOF) switch (c) { case 'c': - ADDCMD(optarg); + ADDCMD(ntp_optarg); break; case 'd': ++debug; @@ -543,11 +543,11 @@ char *argv[]; progname); exit(2); } - if (optind == argc) { + if (ntp_optind == argc) { ADDHOST(DEFHOST); } else { - for (; optind < argc; optind++) - ADDHOST(argv[optind]); + for (; ntp_optind < argc; ntp_optind++) + ADDHOST(argv[ntp_optind]); } if (numcmds == 0 && interactive == 0 @@ -982,7 +982,7 @@ again: /* * Copy the data into the data buffer. */ - bcopy((char *)rpkt.data, (char *)pktdata + offset, count); + memmove((char *)pktdata + offset, (char *)rpkt.data, count); /* * If we've seen the last fragment, look for holes in the sequence. @@ -1050,7 +1050,7 @@ sendrequest(opcode, associd, auth, qsize, qdata) * bit boundary. */ if (qsize > 0) { - bcopy(qdata, (char *)qpkt.data, qsize); + memmove((char *)qpkt.data, qdata, qsize); pktsize = qsize + CTL_HEADER_LEN; while (pktsize & (sizeof(U_LONG)-1)) { qpkt.data[qsize++] = 0; @@ -1541,7 +1541,7 @@ getnetnum(host, num, fullhost) } return 1; } else if ((hp = gethostbyname(host)) != 0) { - bcopy(hp->h_addr, (char *)num, sizeof(U_LONG)); + memmove((char *)num, hp->h_addr, sizeof(U_LONG)); if (fullhost != 0) (void) strcpy(fullhost, hp->h_name); return 1; @@ -1888,11 +1888,11 @@ help(pcmd, fp) for (xcp = opcmds; xcp->keyword != 0; xcp++) cmdsort[n++] = xcp->keyword; -#if defined(sgi) +#if defined(sgi) || defined(SYS_BSDI) qsort((void *)cmdsort, n, sizeof(char *), helpsort); #else qsort((char *)cmdsort, n, sizeof(char *), helpsort); -#endif /* sgi */ +#endif /* sgi || bsdi */ maxlength = 0; for (i = 0; i < n; i++) { @@ -1934,7 +1934,7 @@ help(pcmd, fp) * helpsort - do hostname qsort comparisons */ static int -#if defined(sgi) +#if defined(sgi) || defined(SYS_BSDI) helpsort(t1, t2) const void *t1; const void *t2; @@ -1946,7 +1946,7 @@ helpsort(name1, name2) char **name1; char **name2; { -#endif /* sgi */ +#endif /* sgi || bsdi */ return strcmp(*name1, *name2); } @@ -2577,6 +2577,7 @@ nextvar(datalen, datap, vname, vvalue) register char *cp; register char *np; register char *cpend; + int quoted = 0; static char name[MAXVARLEN]; static char value[MAXVALLEN]; @@ -2623,8 +2624,11 @@ nextvar(datalen, datap, vname, vvalue) while (cp < cpend && (isspace(*cp) && *cp != '\r' && *cp != '\n')) cp++; np = value; - while (cp < cpend && *cp != ',') - *np++ = *cp++; + while (cp < cpend && ((*cp != ',') || quoted)) + { + quoted ^= ((*np++ = *cp++) == '"'); + } + while (np > value && isspace(*(np-1))) np--; *np = '\0'; @@ -3024,13 +3028,13 @@ void sortassoc() { if (numassoc > 1) -#if defined(sgi) +#if defined(sgi) || defined(SYS_BSDI) qsort((void *)assoc_cache, numassoc, sizeof(struct association), assoccmp); #else qsort((char *)assoc_cache, numassoc, sizeof(struct association), assoccmp); -#endif /* sgi */ +#endif /* sgi || bsdi */ } @@ -3038,7 +3042,7 @@ sortassoc() * assoccmp - compare two associations */ static int -#if defined(sgi) +#if defined(sgi) || defined(SYS_BSDI) assoccmp(t1, t2) const void *t1; const void *t2; @@ -3050,7 +3054,7 @@ assoccmp(ass1, ass2) struct association *ass1; struct association *ass2; { -#endif /* sgi */ +#endif /* sgi || bsdi */ if (ass1->assid < ass2->assid) return -1; if (ass1->assid > ass2->assid) diff --git a/usr.sbin/xntpd/ntpq/ntpq_ops.c b/usr.sbin/xntpd/ntpq/ntpq_ops.c index 17929ac..395a9ec 100644 --- a/usr.sbin/xntpd/ntpq/ntpq_ops.c +++ b/usr.sbin/xntpd/ntpq/ntpq_ops.c @@ -217,6 +217,7 @@ checkassocid(value) /* * strsave - save a string + * XXX - should be in libntp.a */ static char * strsave(str) @@ -231,8 +232,8 @@ strsave(str) exit(1); } - bcopy(str, cp, len); - return cp; + memmove(cp, str, len); + return (cp); } @@ -372,11 +373,11 @@ makequerydata(vlist, datalen, data) if (cp != data) *cp++ = ','; - bcopy(vl->name, cp, namelen); + memmove(cp, vl->name, namelen); cp += namelen; if (valuelen != 0) { *cp++ = '='; - bcopy(vl->value, cp, valuelen); + memmove(cp, vl->value, valuelen); cp += valuelen; } } @@ -600,7 +601,7 @@ readvar(pcmd, fp) else if ((associd = checkassocid(pcmd->argval[0].uval)) == 0) return; - bzero((char *)tmplist, sizeof(tmplist)); + memset((char *)tmplist, 0, sizeof(tmplist)); if (pcmd->nargs >= 2) doaddvlist(tmplist, pcmd->argval[1].string); @@ -631,7 +632,7 @@ writevar(pcmd, fp) else if ((associd = checkassocid(pcmd->argval[0].uval)) == 0) return; - bzero((char *)tmplist, sizeof(tmplist)); + memset((char *)tmplist, 0, sizeof(tmplist)); doaddvlist(tmplist, pcmd->argval[1].string); res = doquerylist(tmplist, CTL_OP_WRITEVAR, associd, 0, &rstatus, @@ -690,7 +691,7 @@ clockvar(pcmd, fp) else if ((associd = checkassocid(pcmd->argval[0].uval)) == 0) return; - bzero((char *)tmplist, sizeof(tmplist)); + memset((char *)tmplist, 0, sizeof(tmplist)); if (pcmd->nargs >= 2) doaddvlist(tmplist, pcmd->argval[1].string); @@ -802,7 +803,7 @@ mreadvar(pcmd, fp) &from, &to)) return; - bzero((char *)tmplist, sizeof(tmplist)); + memset((char *)tmplist, 0, sizeof(tmplist)); if (pcmd->nargs >= 3) doaddvlist(tmplist, pcmd->argval[2].string); @@ -1282,7 +1283,7 @@ doprintpeers(pvl, associd, rstatus, datalen, data, fp) char refid_string[10]; extern struct ctl_var peer_var[]; - bzero((char *)havevar, sizeof(havevar)); + memset((char *)havevar, 0, sizeof(havevar)); gettstamp(&ts); while (nextvar(&datalen, &data, &name, &value)) { |