X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstrutil.c;h=1f558f15ffe4c38f81818a5ef5bb1509403b71b9;hb=83a05ca9b3113b3c57658dead05a3bcd32713851;hp=30e992b815468e5a86c1210652b3a19aece2720b;hpb=4f0463a079f61ca60ac94a126a5a9cd0f40c14f3;p=libsigrok.git
diff --git a/src/strutil.c b/src/strutil.c
index 30e992b8..1f558f15 100644
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -17,7 +17,17 @@
* along with this program; if not, see .
*/
+/* Needed for POSIX.1-2008 locale functions */
+#define _XOPEN_SOURCE 700
#include
+#include
+#include
+#if defined(__FreeBSD__) || defined(__APPLE__)
+#include
+#endif
+#if defined(__FreeBSD__)
+#include
+#endif
#include
#include
#include
@@ -67,6 +77,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;
@@ -129,6 +142,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;
@@ -243,6 +259,338 @@ SR_PRIV int sr_atof_ascii(const char *str, float *ret)
return SR_OK;
}
+/**
+ * Compose a string with a format string in the buffer pointed to by buf.
+ *
+ * It is up to the caller to ensure that the allocated buffer is large enough
+ * to hold the formatted result.
+ *
+ * A terminating NUL character is automatically appended after the content
+ * written.
+ *
+ * After the format parameter, the function expects at least as many additional
+ * arguments as needed for format.
+ *
+ * This version ignores the current locale and uses the locale "C" for Linux,
+ * FreeBSD, OSX and Android.
+ *
+ * @param buf Pointer to a buffer where the resulting C string is stored.
+ * @param format C string that contains a format string (see printf).
+ * @param ... A sequence of additional arguments, each containing a value to be
+ * used to replace a format specifier in the format string.
+ *
+ * @return On success, the number of characters that would have been written,
+ * not counting the terminating NUL character.
+ *
+ * @since 0.6.0
+ */
+SR_API int sr_sprintf_ascii(char *buf, const char *format, ...)
+{
+ int ret;
+ va_list args;
+
+ va_start(args, format);
+ ret = sr_vsprintf_ascii(buf, format, args);
+ va_end(args);
+
+ return ret;
+}
+
+/**
+ * Compose a string with a format string in the buffer pointed to by buf.
+ *
+ * It is up to the caller to ensure that the allocated buffer is large enough
+ * to hold the formatted result.
+ *
+ * Internally, the function retrieves arguments from the list identified by
+ * args as if va_arg was used on it, and thus the state of args is likely to
+ * be altered by the call.
+ *
+ * In any case, args should have been initialized by va_start at some point
+ * before the call, and it is expected to be released by va_end at some point
+ * after the call.
+ *
+ * This version ignores the current locale and uses the locale "C" for Linux,
+ * FreeBSD, OSX and Android.
+ *
+ * @param buf Pointer to a buffer where the resulting C string is stored.
+ * @param format C string that contains a format string (see printf).
+ * @param args A value identifying a variable arguments list initialized with
+ * va_start.
+ *
+ * @return On success, the number of characters that would have been written,
+ * not counting the terminating NUL character.
+ *
+ * @since 0.6.0
+ */
+SR_API int sr_vsprintf_ascii(char *buf, const char *format, va_list args)
+{
+#if defined(_WIN32)
+ int ret;
+
+#if 0
+ /*
+ * TODO: This part compiles with mingw-w64 but doesn't run with Win7.
+ * Doesn't start because of "Procedure entry point _create_locale
+ * not found in msvcrt.dll".
+ * mingw-w64 should link to msvcr100.dll not msvcrt.dll!
+ * See: https://msdn.microsoft.com/en-us/en-en/library/1kt27hek.aspx
+ */
+ _locale_t locale;
+
+ locale = _create_locale(LC_NUMERIC, "C");
+ ret = _vsprintf_l(buf, format, locale, args);
+ _free_locale(locale);
+#endif
+
+ /* vsprintf() uses the current locale, may not work correctly for floats. */
+ ret = vsprintf(buf, format, args);
+
+ return ret;
+#elif defined(__APPLE__)
+ /*
+ * See:
+ * https://developer.apple.com/legacy/library/documentation/Darwin/Reference/ManPages/man3/printf_l.3.html
+ * https://developer.apple.com/legacy/library/documentation/Darwin/Reference/ManPages/man3/xlocale.3.html
+ */
+ int ret;
+ locale_t locale;
+
+ locale = newlocale(LC_NUMERIC_MASK, "C", NULL);
+ ret = vsprintf_l(buf, locale, format, args);
+ freelocale(locale);
+
+ return ret;
+#elif defined(__FreeBSD__) && __FreeBSD_version >= 901000
+ /*
+ * See:
+ * https://www.freebsd.org/cgi/man.cgi?query=printf_l&apropos=0&sektion=3&manpath=FreeBSD+9.1-RELEASE
+ * https://www.freebsd.org/cgi/man.cgi?query=xlocale&apropos=0&sektion=3&manpath=FreeBSD+9.1-RELEASE
+ */
+ int ret;
+ locale_t locale;
+
+ locale = newlocale(LC_NUMERIC_MASK, "C", NULL);
+ ret = vsprintf_l(buf, locale, format, args);
+ freelocale(locale);
+
+ return ret;
+#elif defined(__ANDROID__)
+ /*
+ * The Bionic libc only has two locales ("C" aka "POSIX" and "C.UTF-8"
+ * aka "en_US.UTF-8"). The decimal point is hard coded as "."
+ * See: https://android.googlesource.com/platform/bionic/+/master/libc/bionic/locale.cpp
+ */
+ int ret;
+
+ ret = vsprintf(buf, format, args);
+
+ return ret;
+#elif defined(__linux__)
+ int ret;
+ locale_t old_locale, temp_locale;
+
+ /* Switch to C locale for proper float/double conversion. */
+ temp_locale = newlocale(LC_NUMERIC, "C", NULL);
+ old_locale = uselocale(temp_locale);
+
+ ret = vsprintf(buf, format, args);
+
+ /* Switch back to original locale. */
+ uselocale(old_locale);
+ freelocale(temp_locale);
+
+ return ret;
+#elif defined(__unix__) || defined(__unix)
+ /*
+ * This is a fallback for all other BSDs, *nix and FreeBSD <= 9.0, by
+ * using the current locale for snprintf(). This may not work correctly
+ * for floats!
+ */
+ int ret;
+
+ ret = vsprintf(buf, format, args);
+
+ return ret;
+#else
+ /* No implementation for unknown systems! */
+ return -1;
+#endif
+}
+
+/**
+ * Composes a string with a format string (like printf) in the buffer pointed
+ * by buf (taking buf_size as the maximum buffer capacity to fill).
+ * If the resulting string would be longer than n - 1 characters, the remaining
+ * characters are discarded and not stored, but counted for the value returned
+ * by the function.
+ * A terminating NUL character is automatically appended after the content
+ * written.
+ * After the format parameter, the function expects at least as many additional
+ * arguments as needed for format.
+ *
+ * This version ignores the current locale and uses the locale "C" for Linux,
+ * FreeBSD, OSX and Android.
+ *
+ * @param buf Pointer to a buffer where the resulting C string is stored.
+ * @param buf_size Maximum number of bytes to be used in the buffer. The
+ * generated string has a length of at most buf_size - 1, leaving space
+ * for the additional terminating NUL character.
+ * @param format C string that contains a format string (see printf).
+ * @param ... A sequence of additional arguments, each containing a value to be
+ * used to replace a format specifier in the format string.
+ *
+ * @return On success, the number of characters that would have been written if
+ * buf_size had been sufficiently large, not counting the terminating
+ * NUL character. On failure, a negative number is returned.
+ * Notice that only when this returned value is non-negative and less
+ * than buf_size, the string has been completely written.
+ *
+ * @since 0.6.0
+ */
+SR_API int sr_snprintf_ascii(char *buf, size_t buf_size,
+ const char *format, ...)
+{
+ int ret;
+ va_list args;
+
+ va_start(args, format);
+ ret = sr_vsnprintf_ascii(buf, buf_size, format, args);
+ va_end(args);
+
+ return ret;
+}
+
+/**
+ * Composes a string with a format string (like printf) in the buffer pointed
+ * by buf (taking buf_size as the maximum buffer capacity to fill).
+ * If the resulting string would be longer than n - 1 characters, the remaining
+ * characters are discarded and not stored, but counted for the value returned
+ * by the function.
+ * A terminating NUL character is automatically appended after the content
+ * written.
+ * Internally, the function retrieves arguments from the list identified by
+ * args as if va_arg was used on it, and thus the state of args is likely to
+ * be altered by the call.
+ * In any case, arg should have been initialized by va_start at some point
+ * before the call, and it is expected to be released by va_end at some point
+ * after the call.
+ *
+ * This version ignores the current locale and uses the locale "C" for Linux,
+ * FreeBSD, OSX and Android.
+ *
+ * @param buf Pointer to a buffer where the resulting C string is stored.
+ * @param buf_size Maximum number of bytes to be used in the buffer. The
+ * generated string has a length of at most buf_size - 1, leaving space
+ * for the additional terminating NUL character.
+ * @param format C string that contains a format string (see printf).
+ * @param args A value identifying a variable arguments list initialized with
+ * va_start.
+ *
+ * @return On success, the number of characters that would have been written if
+ * buf_size had been sufficiently large, not counting the terminating
+ * NUL character. On failure, a negative number is returned.
+ * Notice that only when this returned value is non-negative and less
+ * than buf_size, the string has been completely written.
+ *
+ * @since 0.6.0
+ */
+SR_API int sr_vsnprintf_ascii(char *buf, size_t buf_size,
+ const char *format, va_list args)
+{
+#if defined(_WIN32)
+ int ret;
+
+#if 0
+ /*
+ * TODO: This part compiles with mingw-w64 but doesn't run with Win7.
+ * Doesn't start because of "Procedure entry point _create_locale
+ * not found in msvcrt.dll".
+ * mingw-w64 should link to msvcr100.dll not msvcrt.dll!.
+ * See: https://msdn.microsoft.com/en-us/en-en/library/1kt27hek.aspx
+ */
+ _locale_t locale;
+
+ locale = _create_locale(LC_NUMERIC, "C");
+ ret = _vsnprintf_l(buf, buf_size, format, locale, args);
+ _free_locale(locale);
+#endif
+
+ /* vsprintf uses the current locale, may cause issues for floats. */
+ ret = vsnprintf(buf, buf_size, format, args);
+
+ return ret;
+#elif defined(__APPLE__)
+ /*
+ * See:
+ * https://developer.apple.com/legacy/library/documentation/Darwin/Reference/ManPages/man3/printf_l.3.html
+ * https://developer.apple.com/legacy/library/documentation/Darwin/Reference/ManPages/man3/xlocale.3.html
+ */
+ int ret;
+ locale_t locale;
+
+ locale = newlocale(LC_NUMERIC_MASK, "C", NULL);
+ ret = vsnprintf_l(buf, buf_size, locale, format, args);
+ freelocale(locale);
+
+ return ret;
+#elif defined(__FreeBSD__) && __FreeBSD_version >= 901000
+ /*
+ * See:
+ * https://www.freebsd.org/cgi/man.cgi?query=printf_l&apropos=0&sektion=3&manpath=FreeBSD+9.1-RELEASE
+ * https://www.freebsd.org/cgi/man.cgi?query=xlocale&apropos=0&sektion=3&manpath=FreeBSD+9.1-RELEASE
+ */
+ int ret;
+ locale_t locale;
+
+ locale = newlocale(LC_NUMERIC_MASK, "C", NULL);
+ ret = vsnprintf_l(buf, buf_size, locale, format, args);
+ freelocale(locale);
+
+ return ret;
+#elif defined(__ANDROID__)
+ /*
+ * The Bionic libc only has two locales ("C" aka "POSIX" and "C.UTF-8"
+ * aka "en_US.UTF-8"). The decimal point is hard coded as ".".
+ * See: https://android.googlesource.com/platform/bionic/+/master/libc/bionic/locale.cpp
+ */
+ int ret;
+
+ ret = vsnprintf(buf, buf_size, format, args);
+
+ return ret;
+#elif defined(__linux__)
+ int ret;
+ locale_t old_locale, temp_locale;
+
+ /* Switch to C locale for proper float/double conversion. */
+ temp_locale = newlocale(LC_NUMERIC, "C", NULL);
+ old_locale = uselocale(temp_locale);
+
+ ret = vsnprintf(buf, buf_size, format, args);
+
+ /* Switch back to original locale. */
+ uselocale(old_locale);
+ freelocale(temp_locale);
+
+ return ret;
+#elif defined(__unix__) || defined(__unix)
+ /*
+ * This is a fallback for all other BSDs, *nix and FreeBSD <= 9.0, by
+ * using the current locale for snprintf(). This may not work correctly
+ * for floats!
+ */
+ int ret;
+
+ ret = vsnprintf(buf, buf_size, format, args);
+
+ return ret;
+#else
+ /* No implementation for unknown systems! */
+ return -1;
+#endif
+}
+
/**
* Convert a string representation of a numeric value to a sr_rational.
*
@@ -273,12 +621,15 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret)
if (str == endptr && (str[0] == '-' || str[0] == '+') && str[1] == '.')
endptr += 1;
+ else if ((str == endptr && str[0] == '.' ))
+ ;
else if (errno)
return SR_ERR;
if (integral < 0 || str[0] == '-')
is_negative = true;
+ errno = 0;
if (*endptr == '.') {
const char* start = endptr + 1;
fractional = g_ascii_strtoll(start, &endptr, 10);
@@ -287,6 +638,7 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret)
fractional_len = endptr - start;
}
+ errno = 0;
if ((*endptr == 'E') || (*endptr == 'e')) {
exponent = g_ascii_strtoll(endptr + 1, &endptr, 10);
if (errno)
@@ -477,7 +829,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;
@@ -504,6 +857,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--;
@@ -513,8 +878,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;
@@ -601,11 +967,11 @@ SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q)
while (*s == ' ')
s++;
if (!strcmp(s, "fs"))
- *q = 1000000000000000ULL;
+ *q = UINT64_C(1000000000000000);
else if (!strcmp(s, "ps"))
- *q = 1000000000000ULL;
+ *q = UINT64_C(1000000000000);
else if (!strcmp(s, "ns"))
- *q = 1000000000ULL;
+ *q = UINT64_C(1000000000);
else if (!strcmp(s, "us"))
*q = 1000000;
else if (!strcmp(s, "ms"))