X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstrutil.c;h=5344ec2903218bef4c7e9baabd3412d10b7929e5;hb=972398f471696e6c8995f7066d6f5a4a1d2b3552;hp=4b5b9ec7c2ebbecc8ba58d6166f8f074ccae16a0;hpb=a547531bf1be0d263a76c1ce53605d70d9a9740b;p=libsigrok.git diff --git a/src/strutil.c b/src/strutil.c index 4b5b9ec7..5344ec29 100644 --- a/src/strutil.c +++ b/src/strutil.c @@ -18,11 +18,13 @@ */ #include +#include #include #include #include #include #include +#include #include #include "libsigrok-internal.h" @@ -66,6 +68,9 @@ SR_PRIV int sr_atol(const char *str, long *ret) errno = 0; tmp = strtol(str, &endptr, 10); + while (endptr && isspace(*endptr)) + endptr++; + if (!endptr || *endptr || errno) { if (!errno) errno = EINVAL; @@ -128,6 +133,9 @@ SR_PRIV int sr_atod(const char *str, double *ret) errno = 0; tmp = strtof(str, &endptr); + while (endptr && isspace(*endptr)) + endptr++; + if (!endptr || *endptr || errno) { if (!errno) errno = EINVAL; @@ -168,6 +176,38 @@ SR_PRIV int sr_atof(const char *str, float *ret) return SR_OK; } +/** + * @private + * + * Convert a string representation of a numeric value to a double. The + * conversion is strict and will fail if the complete string does not represent + * a valid double. The function sets errno according to the details of the + * failure. This version ignores the locale. + * + * @param str The string representation to convert. + * @param ret Pointer to double where the result of the conversion will be stored. + * + * @retval SR_OK Conversion successful. + * @retval SR_ERR Failure. + */ +SR_PRIV int sr_atod_ascii(const char *str, double *ret) +{ + double tmp; + char *endptr = NULL; + + errno = 0; + tmp = g_ascii_strtod(str, &endptr); + + if (!endptr || *endptr || errno) { + if (!errno) + errno = EINVAL; + return SR_ERR; + } + + *ret = tmp; + return SR_OK; +} + /** * @private * @@ -233,13 +273,19 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret) int64_t denominator = 1; int32_t fractional_len = 0; int32_t exponent = 0; + bool is_negative = false; errno = 0; integral = g_ascii_strtoll(str, &endptr, 10); - if (errno) + if (str == endptr && (str[0] == '-' || str[0] == '+') && str[1] == '.') + endptr += 1; + else if (errno) return SR_ERR; + if (integral < 0 || str[0] == '-') + is_negative = true; + if (*endptr == '.') { const char* start = endptr + 1; fractional = g_ascii_strtoll(start, &endptr, 10); @@ -261,7 +307,7 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret) integral *= 10; exponent -= fractional_len; - if (integral >= 0) + if (!is_negative) integral += fractional; else integral -= fractional; @@ -347,43 +393,50 @@ SR_API char *sr_samplerate_string(uint64_t samplerate) } /** - * Convert a numeric frequency value to the "natural" string representation - * of its period. + * Convert a numeric period value to the "natural" string representation + * of its period value. + * + * The period is specified as a rational number's numerator and denominator. * - * E.g. a value of 3000000 would be converted to "3 us", 20000 to "50 ms". + * E.g. a pair of (1, 5) would be converted to "200 ms", (10, 100) to "100 ms". * - * @param frequency The frequency in Hz. + * @param v_p The period numerator. + * @param v_q The period denominator. * - * @return A newly allocated string representation of the frequency value, + * @return A newly allocated string representation of the period value, * or NULL upon errors. The caller is responsible to g_free() the * memory. * - * @since 0.1.0 + * @since 0.5.0 */ -SR_API char *sr_period_string(uint64_t frequency) +SR_API char *sr_period_string(uint64_t v_p, uint64_t v_q) { - char *o; - int r; - - /* Allocate enough for a uint64_t as string + " ms". */ - o = g_malloc0(30 + 1); - - if (frequency >= SR_GHZ(1)) - r = snprintf(o, 30, "%lld ps", 1000000000000ull / frequency); - else if (frequency >= SR_MHZ(1)) - r = snprintf(o, 30, "%lld ns", 1000000000ull / frequency); - else if (frequency >= SR_KHZ(1)) - r = snprintf(o, 30, "%lld us", 1000000ull / frequency); - else - r = snprintf(o, 30, "%lld ms", 1000ull / frequency); - - if (r < 0) { - /* Something went wrong... */ - g_free(o); - return NULL; + double freq, v; + int prec; + + freq = 1 / ((double)v_p / v_q); + + if (freq > SR_GHZ(1)) { + v = (double)v_p / v_q * 1000000000000.0; + prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3; + return g_strdup_printf("%.*f ps", prec, v); + } else if (freq > SR_MHZ(1)) { + v = (double)v_p / v_q * 1000000000.0; + prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3; + return g_strdup_printf("%.*f ns", prec, v); + } else if (freq > SR_KHZ(1)) { + v = (double)v_p / v_q * 1000000.0; + prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3; + return g_strdup_printf("%.*f us", prec, v); + } else if (freq > 1) { + v = (double)v_p / v_q * 1000.0; + prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3; + return g_strdup_printf("%.*f ms", prec, v); + } else { + v = (double)v_p / v_q; + prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3; + return g_strdup_printf("%.*f s", prec, v); } - - return o; } /** @@ -404,25 +457,12 @@ SR_API char *sr_period_string(uint64_t frequency) */ SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q) { - int r; - char *o; - - o = g_malloc0(30 + 1); - if (v_q == 1000) - r = snprintf(o, 30, "%" PRIu64 "mV", v_p); + return g_strdup_printf("%" PRIu64 " mV", v_p); else if (v_q == 1) - r = snprintf(o, 30, "%" PRIu64 "V", v_p); + return g_strdup_printf("%" PRIu64 " V", v_p); else - r = snprintf(o, 30, "%gV", (float)v_p / (float)v_q); - - if (r < 0) { - /* Something went wrong... */ - g_free(o); - return NULL; - } - - return o; + return g_strdup_printf("%g V", (float)v_p / (float)v_q); } /** @@ -444,7 +484,8 @@ SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q) */ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size) { - int multiplier, done; + uint64_t multiplier; + int done; double frac_part; char *s; @@ -471,6 +512,18 @@ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size) case 'G': multiplier = SR_GHZ(1); break; + case 't': + case 'T': + multiplier = SR_GHZ(1000); + break; + case 'p': + case 'P': + multiplier = SR_GHZ(1000 * 1000); + break; + case 'e': + case 'E': + multiplier = SR_GHZ(1000 * 1000 * 1000); + break; default: done = TRUE; s--; @@ -480,8 +533,9 @@ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size) if (multiplier > 0) { *size *= multiplier; *size += frac_part * multiplier; - } else + } else { *size += frac_part; + } if (s && *s && g_ascii_strcasecmp(s, "Hz")) return SR_ERR; @@ -537,8 +591,13 @@ SR_API uint64_t sr_parse_timestring(const char *timestring) /** @since 0.1.0 */ SR_API gboolean sr_parse_boolstring(const char *boolstr) { - if (!boolstr) - return FALSE; + /* + * Complete absence of an input spec is assumed to mean TRUE, + * as in command line option strings like this: + * ...:samplerate=100k:header:numchannels=4:... + */ + if (!boolstr || !*boolstr) + return TRUE; if (!g_ascii_strncasecmp(boolstr, "true", 4) || !g_ascii_strncasecmp(boolstr, "yes", 3) ||