Skip to content

Commit

Permalink
fix \r\r\n
Browse files Browse the repository at this point in the history
  • Loading branch information
mlin committed Jan 8, 2022
1 parent d51295c commit 8395d89
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions kstring.c
Original file line number Diff line number Diff line change
Expand Up @@ -312,14 +312,15 @@ int kgetline3(kstring_t *s, kgets_func2 *fgets_fn, void *fp)

int kgetline2(kstring_t *s, kgets_func2 *fgets_fn, void *fp)
{
size_t l0 = s->l;
int ret = kgetline3(s, fgets_fn, fp);
if (ret < 0) {
return ret;
}

if (s->l && s->s[s->l-1] == '\n') {
if (s->l > l0 && s->s[s->l-1] == '\n') {
s->l--;
if (s->l && s->s[s->l-1] == '\r') s->l--;
if (s->l > l0 && s->s[s->l-1] == '\r') s->l--;
}
s->s[s->l] = '\0';
return 0;
Expand Down

0 comments on commit 8395d89

Please sign in to comment.