2d4e511ca2
Update ntp-4.2.8p13 --> 4.2.8p14. The advisory can be found at: http://support.ntp.org/bin/view/Main/SecurityNotice#\ March_2020_ntp_4_2_8p14_NTP_Rele No CVEs have been documented yet. MFC after: now Security: http://support.ntp.org/bin/view/Main/NtpBug3610 http://support.ntp.org/bin/view/Main/NtpBug3596 http://support.ntp.org/bin/view/Main/NtpBug3592
100 lines
2.0 KiB
C
100 lines
2.0 KiB
C
/*
|
|
* mstolfp - convert an ascii string in milliseconds to an l_fp number
|
|
*/
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#include <ctype.h>
|
|
|
|
#include "ntp_fp.h"
|
|
#include "ntp_stdlib.h"
|
|
|
|
int
|
|
mstolfp(
|
|
const char *str,
|
|
l_fp *lfp
|
|
)
|
|
{
|
|
register const char *cp;
|
|
register char *bp;
|
|
register const char *cpdec;
|
|
char buf[100];
|
|
|
|
/*
|
|
* We understand numbers of the form:
|
|
*
|
|
* [spaces][-|+][digits][.][digits][spaces|\n|\0]
|
|
*
|
|
* This is one enormous hack. Since I didn't feel like
|
|
* rewriting the decoding routine for milliseconds, what
|
|
* is essentially done here is to make a copy of the string
|
|
* with the decimal moved over three places so the seconds
|
|
* decoding routine can be used.
|
|
*/
|
|
bp = buf;
|
|
cp = str;
|
|
while (isspace((unsigned char)*cp))
|
|
cp++;
|
|
|
|
if (*cp == '-' || *cp == '+') {
|
|
*bp++ = *cp++;
|
|
}
|
|
|
|
if (*cp != '.' && !isdigit((unsigned char)*cp))
|
|
return 0;
|
|
|
|
|
|
/*
|
|
* Search forward for the decimal point or the end of the string.
|
|
*/
|
|
cpdec = cp;
|
|
while (isdigit((unsigned char)*cpdec))
|
|
cpdec++;
|
|
|
|
/*
|
|
* Found something. If we have more than three digits copy the
|
|
* excess over, else insert a leading 0.
|
|
*/
|
|
if ((cpdec - cp) > 3) {
|
|
do {
|
|
*bp++ = (char)*cp++;
|
|
} while ((cpdec - cp) > 3);
|
|
} else {
|
|
*bp++ = '0';
|
|
}
|
|
|
|
/*
|
|
* Stick the decimal in. If we've got less than three digits in
|
|
* front of the millisecond decimal we insert the appropriate number
|
|
* of zeros.
|
|
*/
|
|
*bp++ = '.';
|
|
if ((cpdec - cp) < 3) {
|
|
size_t i = 3 - (cpdec - cp);
|
|
do {
|
|
*bp++ = '0';
|
|
} while (--i > 0);
|
|
}
|
|
|
|
/*
|
|
* Copy the remainder up to the millisecond decimal. If cpdec
|
|
* is pointing at a decimal point, copy in the trailing number too.
|
|
*/
|
|
while (cp < cpdec)
|
|
*bp++ = (char)*cp++;
|
|
|
|
if (*cp == '.') {
|
|
cp++;
|
|
while (isdigit((unsigned char)*cp))
|
|
*bp++ = (char)*cp++;
|
|
}
|
|
*bp = '\0';
|
|
|
|
/*
|
|
* Check to make sure the string is properly terminated. If
|
|
* so, give the buffer to the decoding routine.
|
|
*/
|
|
if (*cp != '\0' && !isspace((unsigned char)*cp))
|
|
return 0;
|
|
return atolfp(buf, lfp);
|
|
}
|