return SR_OK;
}
+/**
+ * Convert a text to a number including support for non-decimal bases.
+ * Also optionally returns the position after the number, where callers
+ * can either error out, or support application specific suffixes.
+ *
+ * @param[in] str The input text to convert.
+ * @param[out] ret The conversion result.
+ * @param[out] end The position after the number.
+ * @param[in] base The number format's base, can be 0.
+ *
+ * @retval SR_OK Conversion successful.
+ * @retval SR_ERR Conversion failed.
+ *
+ * @private
+ *
+ * This routine is more general than @ref sr_atol(), which strictly
+ * expects the input text to contain just a decimal number, and nothing
+ * else in addition. The @ref sr_atol_base() routine accepts trailing
+ * text after the number, and supports non-decimal numbers (bin, hex),
+ * including automatic detection from prefix text.
+ */
+SR_PRIV int sr_atol_base(const char *str, long *ret, char **end, int base)
+{
+ long num;
+ char *endptr;
+
+ /* Add "0b" prefix support which strtol(3) may be missing. */
+ while (str && isspace(*str))
+ str++;
+ if (!base && strncmp(str, "0b", strlen("0b")) == 0) {
+ str += strlen("0b");
+ base = 2;
+ }
+
+ /* Run the number conversion. Quick bail out if that fails. */
+ errno = 0;
+ endptr = NULL;
+ num = strtol(str, &endptr, base);
+ if (!endptr || errno) {
+ if (!errno)
+ errno = EINVAL;
+ return SR_ERR;
+ }
+ *ret = num;
+
+ /* Advance to optional non-space trailing suffix. */
+ while (endptr && isspace(*endptr))
+ endptr++;
+ if (end)
+ *end = endptr;
+
+ return SR_OK;
+}
+
+/**
+ * Convert a text to a number including support for non-decimal bases.
+ * Also optionally returns the position after the number, where callers
+ * can either error out, or support application specific suffixes.
+ *
+ * @param[in] str The input text to convert.
+ * @param[out] ret The conversion result.
+ * @param[out] end The position after the number.
+ * @param[in] base The number format's base, can be 0.
+ *
+ * @retval SR_OK Conversion successful.
+ * @retval SR_ERR Conversion failed.
+ *
+ * @private
+ *
+ * This routine is more general than @ref sr_atol(), which strictly
+ * expects the input text to contain just a decimal number, and nothing
+ * else in addition. The @ref sr_atoul_base() routine accepts trailing
+ * text after the number, and supports non-decimal numbers (bin, hex),
+ * including automatic detection from prefix text.
+ */
+SR_PRIV int sr_atoul_base(const char *str, unsigned long *ret, char **end, int base)
+{
+ unsigned long num;
+ char *endptr;
+
+ /* Add "0b" prefix support which strtol(3) may be missing. */
+ while (str && isspace(*str))
+ str++;
+ if (!base && strncmp(str, "0b", strlen("0b")) == 0) {
+ str += strlen("0b");
+ base = 2;
+ }
+
+ /* Run the number conversion. Quick bail out if that fails. */
+ errno = 0;
+ endptr = NULL;
+ num = strtoul(str, &endptr, base);
+ if (!endptr || errno) {
+ if (!errno)
+ errno = EINVAL;
+ return SR_ERR;
+ }
+ *ret = num;
+
+ /* Advance to optional non-space trailing suffix. */
+ while (endptr && isspace(*endptr))
+ endptr++;
+ if (end)
+ *end = endptr;
+
+ return SR_OK;
+}
+
/**
* Convert a string representation of a numeric value (base 10) to an integer. The
* conversion is strict and will fail if the complete string does not represent
return SR_OK;
}
+/**
+ * Convert text to a floating point value, and get its precision.
+ *
+ * @param[in] str The input text to convert.
+ * @param[out] ret The conversion result, a double precision float number.
+ * @param[out] digits The number of significant decimals.
+ *
+ * @returns SR_OK in case of successful text to number conversion.
+ * @returns SR_ERR when conversion fails.
+ *
+ * @since 0.6.0
+ */
+SR_PRIV int sr_atod_ascii_digits(const char *str, double *ret, int *digits)
+{
+ const char *p;
+ int *dig_ref, m_dig, exp;
+ char c;
+ double f;
+
+ /*
+ * Convert floating point text to the number value, _and_ get
+ * the value's precision in the process. Steps taken to do it:
+ * - Skip leading whitespace.
+ * - Count the number of decimals after the mantissa's period.
+ * - Get the exponent's signed value.
+ *
+ * This implementation still uses common code for the actual
+ * conversion, but "violates API layers" by duplicating the
+ * text scan, to get the number of significant digits.
+ */
+ p = str;
+ while (*p && isspace(*p))
+ p++;
+ if (*p == '-' || *p == '+')
+ p++;
+ m_dig = 0;
+ exp = 0;
+ dig_ref = NULL;
+ while (*p) {
+ c = *p++;
+ if (toupper(c) == 'E') {
+ exp = strtol(p, NULL, 10);
+ break;
+ }
+ if (c == '.') {
+ m_dig = 0;
+ dig_ref = &m_dig;
+ continue;
+ }
+ if (isdigit(c)) {
+ if (dig_ref)
+ (*dig_ref)++;
+ continue;
+ }
+ /* Need not warn, conversion will fail. */
+ break;
+ }
+ sr_spew("atod digits: txt \"%s\" -> m %d, e %d -> digits %d",
+ str, m_dig, exp, m_dig + -exp);
+ m_dig += -exp;
+
+ if (sr_atod_ascii(str, &f) != SR_OK)
+ return SR_ERR;
+ if (ret)
+ *ret = f;
+ if (digits)
+ *digits = m_dig;
+
+ return SR_OK;
+}
+
/**
* Convert a string representation of a numeric value to a float. The
* conversion is strict and will fail if the complete string does not represent
*/
SR_API int sr_parse_rational(const char *str, struct sr_rational *ret)
{
- char *endptr = NULL;
+ const char *readptr;
+ char *endptr;
+ gboolean is_negative, empty_integral, empty_fractional, exp_negative;
int64_t integral;
- int64_t fractional = 0;
- int64_t denominator = 1;
- int32_t fractional_len = 0;
- int32_t exponent = 0;
- gboolean is_negative = FALSE;
- gboolean no_integer, no_fractional;
-
- while (isspace(*str))
- str++;
+ int64_t fractional;
+ int64_t denominator;
+ uint32_t fractional_len;
+ int32_t exponent;
- errno = 0;
- integral = g_ascii_strtoll(str, &endptr, 10);
-
- if (str == endptr && (str[0] == '-' || str[0] == '+') && str[1] == '.') {
- endptr += 1;
- no_integer = TRUE;
- } else if (str == endptr && str[0] == '.') {
- no_integer = TRUE;
- } else if (errno) {
- return SR_ERR;
- } else {
- no_integer = FALSE;
- }
+ /*
+ * Implementor's note: This routine tries hard to avoid calling
+ * glib's or the platform's conversion routines with input that
+ * cannot get converted *at all* (see bug #1093). It also takes
+ * care to return with non-zero errno values for any failed
+ * conversion attempt. It's assumed that correctness and robustness
+ * are more important than performance, which is why code paths
+ * are not optimized at all. Maintainability took priority.
+ */
+
+ readptr = str;
+
+ /* Skip leading whitespace. */
+ while (isspace(*readptr))
+ readptr++;
- if (integral < 0 || str[0] == '-')
+ /* Determine the sign, default to non-negative. */
+ is_negative = FALSE;
+ if (*readptr == '-') {
is_negative = TRUE;
+ readptr++;
+ } else if (*readptr == '+') {
+ is_negative = FALSE;
+ readptr++;
+ }
+ /* Get the (optional) integral part. */
+ empty_integral = TRUE;
+ integral = 0;
+ endptr = (char *)readptr;
errno = 0;
- if (*endptr == '.') {
- gboolean is_exp, is_eos;
- const char *start = endptr + 1;
- fractional = g_ascii_strtoll(start, &endptr, 10);
- is_exp = *endptr == 'E' || *endptr == 'e';
- is_eos = *endptr == '\0';
- if (endptr == start && (is_exp || is_eos)) {
- fractional = 0;
- errno = 0;
- }
+ if (isdigit(*readptr)) {
+ empty_integral = FALSE;
+ integral = g_ascii_strtoll(readptr, &endptr, 10);
if (errno)
return SR_ERR;
- no_fractional = endptr == start;
- if (no_integer && no_fractional)
+ if (endptr == str) {
+ errno = -EINVAL;
return SR_ERR;
- fractional_len = endptr - start;
+ }
+ readptr = endptr;
}
- errno = 0;
- if ((*endptr == 'E') || (*endptr == 'e')) {
- exponent = g_ascii_strtoll(endptr + 1, &endptr, 10);
+ /* Get the optional fractional part. */
+ empty_fractional = TRUE;
+ fractional = 0;
+ fractional_len = 0;
+ if (*readptr == '.') {
+ readptr++;
+ endptr++;
+ errno = 0;
+ if (isdigit(*readptr)) {
+ empty_fractional = FALSE;
+ fractional = g_ascii_strtoll(readptr, &endptr, 10);
+ if (errno)
+ return SR_ERR;
+ if (endptr == readptr) {
+ errno = -EINVAL;
+ return SR_ERR;
+ }
+ fractional_len = endptr - readptr;
+ readptr = endptr;
+ }
+ }
+
+ /* At least one of integral or fractional is required. */
+ if (empty_integral && empty_fractional) {
+ errno = -EINVAL;
+ return SR_ERR;
+ }
+
+ /* Get the (optional) exponent. */
+ exponent = 0;
+ if ((*readptr == 'E') || (*readptr == 'e')) {
+ readptr++;
+ endptr++;
+ exp_negative = FALSE;
+ if (*readptr == '+') {
+ exp_negative = FALSE;
+ readptr++;
+ endptr++;
+ } else if (*readptr == '-') {
+ exp_negative = TRUE;
+ readptr++;
+ endptr++;
+ }
+ if (!isdigit(*readptr)) {
+ errno = -EINVAL;
+ return SR_ERR;
+ }
+ errno = 0;
+ exponent = g_ascii_strtoll(readptr, &endptr, 10);
if (errno)
return SR_ERR;
+ if (endptr == readptr) {
+ errno = -EINVAL;
+ return SR_ERR;
+ }
+ readptr = endptr;
+ if (exp_negative)
+ exponent = -exponent;
}
- if (*endptr != '\0')
+ /* Input must be exhausted. Unconverted remaining input is fatal. */
+ if (*endptr != '\0') {
+ errno = -EINVAL;
return SR_ERR;
+ }
- for (int i = 0; i < fractional_len; i++)
+ /*
+ * Apply the sign to the integral (and fractional) part(s).
+ * Adjust exponent (decimal position) such that the above integral
+ * and fractional parts both fit into the (new) integral part.
+ */
+ if (is_negative)
+ integral = -integral;
+ while (fractional_len-- > 0) {
integral *= 10;
- exponent -= fractional_len;
-
+ exponent--;
+ }
if (!is_negative)
integral += fractional;
else
integral -= fractional;
-
while (exponent > 0) {
integral *= 10;
exponent--;
}
+ /*
+ * When significant digits remain after the decimal, scale up the
+ * denominator such that we end up with two integer p/q numbers.
+ */
+ denominator = 1;
while (exponent < 0) {
denominator *= 10;
exponent++;