diff options
Diffstat (limited to 'libsylph')
-rw-r--r-- | libsylph/utils.c | 39 | ||||
-rw-r--r-- | libsylph/utils.h | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/libsylph/utils.c b/libsylph/utils.c index 525c9a1b..9992de51 100644 --- a/libsylph/utils.c +++ b/libsylph/utils.c @@ -2920,6 +2920,45 @@ gchar *normalize_newlines(const gchar *str) return out; } +gchar *strchomp_all(const gchar *str) +{ + const gchar *p = str; + const gchar *newline, *last; + gchar *out, *outp; + + out = outp = g_malloc(strlen(str) + 1); + while (*p != '\0') { + newline = strchr(p, '\n'); + if (newline) { + for (last = newline; + p < last && g_ascii_isspace(*(last - 1)); --last) + ; + strncpy(outp, p, last - p); + outp += last - p; + + if (p < newline && *(newline - 1) == '\r') { + strncpy(outp, newline - 1, 2); + outp += 2; + } else { + *outp++ = *newline; + } + + p = newline + 1; + } else { + for (last = p + strlen(p); + p < last && g_ascii_isspace(*(last - 1)); --last) + ; + strncpy(outp, p, last - p); + outp += last - p; + break; + } + } + + *outp = '\0'; + + return out; +} + FILE *get_outgoing_rfc2822_file(FILE *fp) { gchar buf[BUFFSIZE]; diff --git a/libsylph/utils.h b/libsylph/utils.h index b8fe7051..1f358ca1 100644 --- a/libsylph/utils.h +++ b/libsylph/utils.h @@ -431,6 +431,7 @@ gint uncanonicalize_file (const gchar *src, gint uncanonicalize_file_replace(const gchar *file); gchar *normalize_newlines (const gchar *str); +gchar *strchomp_all (const gchar *str); FILE *get_outgoing_rfc2822_file (FILE *fp); gchar *get_outgoing_rfc2822_str (FILE *fp); |