sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stdio: lib_fgets convert \r\n to \n

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-02-23 02:25:20 +08:00 committed by archer
parent cd74a1df22
commit 68ff73c5fb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/libc/stdio/lib_libfgets.c
View File

@ -142,6 +142,13 @@ FAR char *lib_fgets(FAR char *buf, size_t buflen, FILE *stream,
if (ch == '\n') if (ch == '\n')
{ {
/* Convert \r\n to \n */
if (nch > 0 && buf[nch - 1] == '\r')
{
--nch;
}
if (keepnl) if (keepnl)
{ {
/* Store newline is stored in the buffer */ /* Store newline is stored in the buffer */
@ -161,7 +168,7 @@ FAR char *lib_fgets(FAR char *buf, size_t buflen, FILE *stream,
{ {
/* End of file with no data? */ /* End of file with no data? */
if (!nch) if (nch == 0)
{ {
/* Yes.. return NULL as the end of file mark */ /* Yes.. return NULL as the end of file mark */