diff options
| -rw-r--r-- | include/utils.h | 2 | ||||
| -rw-r--r-- | src/ini.c | 11 | ||||
| -rw-r--r-- | src/utils.c | 25 |
3 files changed, 27 insertions, 11 deletions
diff --git a/include/utils.h b/include/utils.h index 4d3cd3d..61f5948 100644 --- a/include/utils.h +++ b/include/utils.h @@ -263,4 +263,6 @@ int xml_pretty_print_in_place(const char *filename, const char *pretty_print_pro */ int fix_tox_conf(const char *filename, char **result); +char *collapse_whitespace(char **s); + #endif //OMC_UTILS_H @@ -229,17 +229,6 @@ char *unquote(char *s) { return s; } -char *collapse_whitespace(char **s) { - size_t len = strlen(*s); - size_t i; - for (i = 0; isblank((int)*s[i]); i++); - memmove(*s, *s + i, strlen(*s)); - if (i) { - *s[len - i] = '\0'; - } - return *s; -} - void ini_free(struct INIFILE **ini) { for (size_t section = 0; section < (*ini)->section_count; section++) { for (size_t data = 0; data < (*ini)->section[section]->data_count; data++) { diff --git a/src/utils.c b/src/utils.c index 941923a..74b4f6f 100644 --- a/src/utils.c +++ b/src/utils.c @@ -647,3 +647,28 @@ int fix_tox_conf(const char *filename, char **result) { ini_free(&toxini); return 0; } + +static size_t count_blanks(char *s) { + size_t blank = 0; + for (size_t i = 0; i < strlen(s); i++) { + if (isblank(s[i])) { + blank++; + } else { + break; + } + } + return blank; +} + +char *collapse_whitespace(char **s) { + char *x = (*s); + size_t len = strlen(x); + for (size_t i = 0; i < len; i++) { + size_t blank = count_blanks(&x[i]); + if (blank > 1) { + memmove(&x[i], &x[i] + blank, strlen(&x[i])); + } + } + + return *s; +} |