[Bug 3491] Signed values of LFP datatypes should always display a sign

bk: 5cf5f66aJ8xBKwjSbgfOVnsOQNywzw

diff --git a/ChangeLog b/ChangeLog
index 9ff845c81028eeecbd72fd587d28555bc5f781e5..0dacb9159f0ff0fdffa8d1410f640e5dabe70df0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+* [Bug 3491] Signed values of LFP datatypes should always display a sign
+  - applied patch by Gerry Garvey & fixed unit tests <perlinger@ntp.org>
+
 ---
 (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/include/ntp_fp.h b/include/ntp_fp.h
index 2782ebfe921ac1ba2fd85f02c890135c857a5f7a..afd1f827459e8d3c7c46248ad624acd308cfba90 100644 (file)
--- a/include/ntp_fp.h
+++ b/include/ntp_fp.h
@@ -344,8 +344,8 @@ typedef u_int32 u_fp;
 /*
  * Prototypes
  */
-extern char *  dofptoa         (u_fp, int, short, int);
-extern char *  dolfptoa        (u_int32, u_int32, int, short, int);
+extern char *  dofptoa         (u_fp, char, short, int);
+extern char *  dolfptoa        (u_int32, u_int32, char, short, int);
 
 extern int     atolfp          (const char *, l_fp *);
 extern int     buftvtots       (const char *, l_fp *);

diff --git a/libntp/dofptoa.c b/libntp/dofptoa.c
index 758af2fd7f9f1c501bb725446882157894ec6f36..c21d1455e7f07b140cea6d777f2d4fae622702ba 100644 (file)
--- a/libntp/dofptoa.c
+++ b/libntp/dofptoa.c
@@ -12,7 +12,7 @@
 char *
 dofptoa(
        u_fp fpv,
-       int neg,
+       char sign,
        short ndec,
        int msec
        )
@@ -106,8 +106,8 @@ dofptoa(
         * Copy it into the buffer, asciizing as we go.
         */
        bp = buf;
-       if (neg)
-           *bp++ = '-';
+       if (sign)
+           *bp++ = sign;
        
        while (cp < cpend) {
                if (cp == cpdec)
@@ -135,7 +135,7 @@ fptoa(
                plusfp = (u_fp)fpv;
        }
 
-       return dofptoa(plusfp, neg, ndec, FALSE);
+       return dofptoa(plusfp, (neg?'-':0), ndec, FALSE);
 }
 
 
@@ -155,5 +155,5 @@ fptoms(
                plusfp = (u_fp)fpv;
        }
 
-       return dofptoa(plusfp, neg, ndec, TRUE);
+       return dofptoa(plusfp, (neg?'-':0), ndec, TRUE);
 }

diff --git a/libntp/dolfptoa.c b/libntp/dolfptoa.c
index 68f56e1637e248f1082d96f132ca83f681dcb00f..00e1faf793bc25cb96423473da89e2ef45284aff 100644 (file)
--- a/libntp/dolfptoa.c
+++ b/libntp/dolfptoa.c
@@ -13,7 +13,7 @@ char *
 dolfptoa(
        u_int32 fpi,
        u_int32 fpv,
-       int neg,
+       char sign,
        short ndec,
        int msec
        )
@@ -120,8 +120,8 @@ dolfptoa(
                cp = cpdec - 1;
 
        bp = buf;
-       if (neg)
-               *bp++ = '-';
+       if (sign)
+               *bp++ = sign;
        while (cp < cpend) {
                if (cp == cpdec)
                        *bp++ = '.';
@@ -150,7 +150,7 @@ mfptoa(
                M_NEG(fpi, fpf);
        }
 
-       return dolfptoa(fpi, fpf, isneg, ndec, FALSE);
+       return dolfptoa(fpi, fpf, (isneg?'-':'+'), ndec, FALSE);
 }
 
 
@@ -168,7 +168,7 @@ mfptoms(
                M_NEG(fpi, fpf);
        }
 
-       return dolfptoa(fpi, fpf, isneg, ndec, TRUE);
+       return dolfptoa(fpi, fpf, (isneg?'-':'+'), ndec, TRUE);
 }
 
 

diff --git a/libntp/mstolfp.c b/libntp/mstolfp.c
index 7da20dc911e21203372a8e0d937196cd1114277b..3dfc4efd42e8c44fb40418ad27199be88fb91590 100644 (file)
--- a/libntp/mstolfp.c
+++ b/libntp/mstolfp.c
@@ -22,7 +22,7 @@ mstolfp(
        /*
         * We understand numbers of the form:
         *
-        * [spaces][-][digits][.][digits][spaces|\n|\0]
+        * [spaces][-|+][digits][.][digits][spaces|\n|\0]
         *
         * This is one enormous hack.  Since I didn't feel like
         * rewriting the decoding routine for milliseconds, what
@@ -35,9 +35,8 @@ mstolfp(
        while (isspace((unsigned char)*cp))
            cp++;
        
-       if (*cp == '-') {
-               *bp++ = '-';
-               cp++;
+       if (*cp == '-' || *cp == '+') {
+               *bp++ = *cp++;
        }
 
        if (*cp != '.' && !isdigit((unsigned char)*cp))

diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index 8495e2059ef660feeaf954152b79fd02bd4ca650..8079a357540c065565728814cc086b5d36abead6 100644 (file)
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -1887,11 +1887,11 @@ doprintpeers(
                                       when(&ts, &rec, &reftime)),
                        prettyinterval(pollbuf, sizeof(pollbuf), 
                                       (int)poll_sec),
-                       reach, lfptoms(&estdelay, 3),
+                       reach, ulfptoms(&estdelay, 3),
                        lfptoms(&estoffset, 3),
                        (have_jitter)
-                           ? lfptoms(&estjitter, 3)
-                           : lfptoms(&estdisp, 3));
+                           ? ulfptoms(&estjitter, 3)
+                           : ulfptoms(&estdisp, 3));
                return (1);
        }
        else

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 6e7a5c375175aeb721aa089559cde64cbf0c45d0..af77b754ebe97c4b24c7fe88cc473ebc6194ef9c 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -122,10 +122,12 @@ u_char pktversion = NTP_OLDVERSION + 1;
 #define        NA      2       /* network address */
 #define        LP      3       /* leap (print in binary) */
 #define        RF      4       /* refid (sometimes string, sometimes not) */
-#define        AR      5       /* array of times */
+#define        AU      5       /* array of unsigned times */
 #define FX     6       /* test flags */
 #define TS     7       /* l_fp timestamp in hex */
 #define        OC      8       /* integer, print in octal */
+#define        AS      9       /* array of signed times */
+#define        SN      10      /* signed number: must display +/- sign */
 #define        EOV     255     /* end of table */
 
 /*
@@ -146,10 +148,12 @@ const var_format cookedvars[] = {
        { "srcadr",             HA },
        { "peeradr",            HA },   /* compat with others */
        { "dstadr",             NA },
-       { "filtdelay",          AR },
-       { "filtoffset",         AR },
-       { "filtdisp",           AR },
-       { "filterror",          AR },   /* compat with others */
+       { "filtdelay",          AU },
+       { "filtoffset",         AS },
+       { "filtdisp",           AU },
+       { "filterror",          AU },   /* compat with others */
+       { "offset",             SN },
+       { "frequency",          SN }
 };
 
 
@@ -225,7 +229,7 @@ static      void    rawprint        (int, size_t, const char *, int, int, FILE *);
 static void    startoutput     (void);
 static void    output          (FILE *, const char *, const char *);
 static void    endoutput       (FILE *);
-static void    outputarr       (FILE *, char *, int, l_fp *);
+static void    outputarr       (FILE *, char *, int, l_fp *, int);
 static int     assoccmp        (const void *, const void *);
        u_short varfmt          (const char *);
        void    ntpq_custom_opt_handler(tOptions *, tOptDesc *);
@@ -3493,7 +3497,8 @@ outputarr(
        FILE *fp,
        char *name,
        int narr,
-       l_fp *lfp
+       l_fp *lfp,
+       int issigned
        )
 {
        char *bp;
@@ -3512,7 +3517,7 @@ outputarr(
        for (i = narr; i > 0; i--) {
                if (i != (size_t)narr)
                        *bp++ = ' ';
-               cp = lfptoms(lfp, 2);
+               cp = (issigned ? lfptoms(lfp, 2) : ulfptoms(lfp, 2));
                len = strlen(cp);
                if (len > 7) {
                        cp[7] = '\0';
@@ -3693,11 +3698,12 @@ cookedprint(
                        }
                        break;
 
-               case AR:
+               case AU:
+               case AS:
                        if (!value || !decodearr(value, &narr, lfparr, 8))
                                output_raw = '?';
                        else
-                               outputarr(fp, name, narr, lfparr);
+                               outputarr(fp, name, narr, lfparr, (fmt==AS));
                        break;
 
                case FX:
@@ -3707,6 +3713,17 @@ cookedprint(
                                output(fp, name, tstflags(uval));
                        break;
 
+               case SN:
+                       if (!value)
+                               output_raw = '?';
+                       else if (isdigit(*value)) {     /* number without sign */
+                               bv[0] = '+';
+                               atoascii (value, MAXVALLEN, bv+1, sizeof(bv)-1);
+                               output(fp, name, bv);
+                       } else
+                               output_raw = '*';               /* output as-is */
+                       break;
+
                default:
                        fprintf(stderr, "Internal error in cookedprint, %s=%s, fmt %d\n",
                                name, value, fmt);

diff --git a/tests/libntp/lfptostr.c b/tests/libntp/lfptostr.c
index ed3285378d7eab6de958a533b878d1a8536b5cc5..a049b7903611f6a0aa3d63b16841f6a7d4d1bd77 100644 (file)
--- a/tests/libntp/lfptostr.c
+++ b/tests/libntp/lfptostr.c
@@ -47,8 +47,8 @@ void
 test_PositiveInteger(void) {
        l_fp test = {{200}, 0}; /* exact 200.0000000000 */
 
-       TEST_ASSERT_EQUAL_STRING("200.0000000000", mfptoa(test.l_ui, test.l_uf, LFP_MAX_PRECISION));
-       TEST_ASSERT_EQUAL_STRING("200000.0000000", mfptoms(test.l_ui, test.l_uf, LFP_MAX_PRECISION_MS));
+       TEST_ASSERT_EQUAL_STRING("+200.0000000000", mfptoa(test.l_ui, test.l_uf, LFP_MAX_PRECISION));
+       TEST_ASSERT_EQUAL_STRING("+200000.0000000", mfptoms(test.l_ui, test.l_uf, LFP_MAX_PRECISION_MS));
 }
 
 void
@@ -63,8 +63,8 @@ void
 test_PositiveIntegerWithFraction(void) {
        l_fp test = {{200}, ONE_FOURTH}; /* 200.25 */
 
-       TEST_ASSERT_EQUAL_STRING("200.2500000000", lfptoa(&test, LFP_MAX_PRECISION));
-       TEST_ASSERT_EQUAL_STRING("200250.0000000", lfptoms(&test, LFP_MAX_PRECISION_MS));
+       TEST_ASSERT_EQUAL_STRING("+200.2500000000", lfptoa(&test, LFP_MAX_PRECISION));
+       TEST_ASSERT_EQUAL_STRING("+200250.0000000", lfptoms(&test, LFP_MAX_PRECISION_MS));
 }
 
 void
@@ -79,52 +79,52 @@ void
 test_RoundingDownToInteger(void) {
        l_fp test = {{10}, ONE_FOURTH}; /* 10.25 */
 
-       TEST_ASSERT_EQUAL_STRING("10", lfptoa(&test, 0));
-       TEST_ASSERT_EQUAL_STRING("10250", lfptoms(&test, 0));
+       TEST_ASSERT_EQUAL_STRING("+10", lfptoa(&test, 0));
+       TEST_ASSERT_EQUAL_STRING("+10250", lfptoms(&test, 0));
 }
 
 void
 test_RoundingMiddleToInteger(void) {
        l_fp test = {{10}, HALF}; /* 10.5 */
 
-       TEST_ASSERT_EQUAL_STRING("11", lfptoa(&test, 0));
-       TEST_ASSERT_EQUAL_STRING("10500", lfptoms(&test, 0));
+       TEST_ASSERT_EQUAL_STRING("+11", lfptoa(&test, 0));
+       TEST_ASSERT_EQUAL_STRING("+10500", lfptoms(&test, 0));
 }
 
 void
 test_RoundingUpToInteger(void) {
        l_fp test = {{5}, THREE_FOURTH}; /* 5.75 */
 
-       TEST_ASSERT_EQUAL_STRING("6", lfptoa(&test, 0));
-       TEST_ASSERT_EQUAL_STRING("5750", lfptoms(&test, 0));
+       TEST_ASSERT_EQUAL_STRING("+6", lfptoa(&test, 0));
+       TEST_ASSERT_EQUAL_STRING("+5750", lfptoms(&test, 0));
 }
 
 void
 test_SingleDecimal(void) {
        l_fp test = {{8}, ONE_FOURTH}; /* 8.25 */
 
-       TEST_ASSERT_EQUAL_STRING("8.3", lfptoa(&test, 1));
-       TEST_ASSERT_EQUAL_STRING("8250.0", lfptoms(&test, 1));
+       TEST_ASSERT_EQUAL_STRING("+8.3", lfptoa(&test, 1));
+       TEST_ASSERT_EQUAL_STRING("+8250.0", lfptoms(&test, 1));
 }
 
 void
 test_MillisecondsRoundingUp(void) {
        l_fp test = {{1}, HALF_PROMILLE_UP}; /* slightly more than 1.0005 */
 
-       TEST_ASSERT_EQUAL_STRING("1.0", lfptoa(&test, 1));
+       TEST_ASSERT_EQUAL_STRING("+1.0", lfptoa(&test, 1));
 
-       TEST_ASSERT_EQUAL_STRING("1000.5", lfptoms(&test, 1));
-       TEST_ASSERT_EQUAL_STRING("1001", lfptoms(&test, 0));
+       TEST_ASSERT_EQUAL_STRING("+1000.5", lfptoms(&test, 1));
+       TEST_ASSERT_EQUAL_STRING("+1001", lfptoms(&test, 0));
 }
 
 void
 test_MillisecondsRoundingDown(void) {
        l_fp test = {{1}, HALF_PROMILLE_DOWN}; /* slightly less than 1.0005 */
 
-       TEST_ASSERT_EQUAL_STRING("1.0", lfptoa(&test, 1));
+       TEST_ASSERT_EQUAL_STRING("+1.0", lfptoa(&test, 1));
 
-       TEST_ASSERT_EQUAL_STRING("1000.5", lfptoms(&test, 1));
-       TEST_ASSERT_EQUAL_STRING("1000", lfptoms(&test, 0));
+       TEST_ASSERT_EQUAL_STRING("+1000.5", lfptoms(&test, 1));
+       TEST_ASSERT_EQUAL_STRING("+1000", lfptoms(&test, 0));
 }
 
 void test_UnsignedInteger(void) {

diff --git a/tests/libntp/refidsmear.c b/tests/libntp/refidsmear.c
index da1ebff200ee661b473854abaf03433391a33faf..84163ef1994dbf26fe166bb828d765d3b26abea0 100644 (file)
--- a/tests/libntp/refidsmear.c
+++ b/tests/libntp/refidsmear.c
@@ -120,14 +120,14 @@ void test_refidsmear(void)
        rtol(0xfefffffe, "-0.00000048");
        rtol(0xfeffffff, "-0.00000024");
 
-       rtol(0xfe000000, "0.00000000");
-       rtol(0xfe000001, "0.00000024");
-       rtol(0xfe6ffffe, "1.74999952");
-       rtol(0xfe6fffff, "1.74999976");
-       rtol(0xfe700000, "1.75000000");
-       rtol(0xfe700001, "1.75000024");
-       rtol(0xfe7ffffe, "1.99999952");
-       rtol(0xfe7fffff, "1.99999976");
+       rtol(0xfe000000, "+0.00000000");
+       rtol(0xfe000001, "+0.00000024");
+       rtol(0xfe6ffffe, "+1.74999952");
+       rtol(0xfe6fffff, "+1.74999976");
+       rtol(0xfe700000, "+1.75000000");
+       rtol(0xfe700001, "+1.75000024");
+       rtol(0xfe7ffffe, "+1.99999952");
+       rtol(0xfe7fffff, "+1.99999976");
 
        rtoltor(0xfe800000, "-2.00000000");
        rtoltor(0xfe800001, "-1.99999976");
@@ -138,14 +138,14 @@ void test_refidsmear(void)
        rtoltor(0xfefffffe, "-0.00000048");
        rtoltor(0xfeffffff, "-0.00000024");
 
-       rtoltor(0xfe000000, "0.00000000");
-       rtoltor(0xfe000001, "0.00000024");
-       rtoltor(0xfe6ffffe, "1.74999952");
-       rtoltor(0xfe6fffff, "1.74999976");
-       rtoltor(0xfe700000, "1.75000000");
-       rtoltor(0xfe700001, "1.75000024");
-       rtoltor(0xfe7ffffe, "1.99999952");
-       rtoltor(0xfe7fffff, "1.99999976");
+       rtoltor(0xfe000000, "+0.00000000");
+       rtoltor(0xfe000001, "+0.00000024");
+       rtoltor(0xfe6ffffe, "+1.74999952");
+       rtoltor(0xfe6fffff, "+1.74999976");
+       rtoltor(0xfe700000, "+1.75000000");
+       rtoltor(0xfe700001, "+1.75000024");
+       rtoltor(0xfe7ffffe, "+1.99999952");
+       rtoltor(0xfe7fffff, "+1.99999976");
 
        return;
 }