diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-04-02 15:13:19 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-04-02 15:13:19 +0100 |
| commit | b02302fedd1f8320d89c5d794622bef050f6e54c (patch) | |
| tree | 5ba3d1620ab2d794d323cc35697b78d1689932f6 /libbb/get_line_from_file.c | |
| parent | a65c74c163aeccd6bd202954b73bce6142534628 (diff) | |
| download | busybox-w32-b02302fedd1f8320d89c5d794622bef050f6e54c.tar.gz busybox-w32-b02302fedd1f8320d89c5d794622bef050f6e54c.tar.bz2 busybox-w32-b02302fedd1f8320d89c5d794622bef050f6e54c.zip | |
Strip trailing CR in xmalloc_fgetline
Diffstat (limited to 'libbb/get_line_from_file.c')
| -rw-r--r-- | libbb/get_line_from_file.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c index a98dd35eb..2038fac7d 100644 --- a/libbb/get_line_from_file.c +++ b/libbb/get_line_from_file.c | |||
| @@ -57,6 +57,10 @@ char* FAST_FUNC xmalloc_fgetline(FILE *file) | |||
| 57 | 57 | ||
| 58 | if (i && c[--i] == '\n') | 58 | if (i && c[--i] == '\n') |
| 59 | c[i] = '\0'; | 59 | c[i] = '\0'; |
| 60 | #if ENABLE_PLATFORM_MINGW32 | ||
| 61 | if (i && c[--i] == '\r') | ||
| 62 | c[i] = '\0'; | ||
| 63 | #endif | ||
| 60 | 64 | ||
| 61 | return c; | 65 | return c; |
| 62 | } | 66 | } |