alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

newlib: fix return value of no-VFS _read_r if nothing received

Browse Source 
'read' function should return 0 when encountering an end of file. When
newlib calls read and sees EOF returned, it assumes that this
condition is permanent and never calls 'read' for this file again
(unless the read pointer is moved using fseek).
The correct behavior in case no characters were received over UART is
to return -1. In this case newlib will retry reading from file on next
call to fread, fgetc or another function which calls __srefill_r.
This commit is contained in:
Ivan Grokhotkov 2022-05-02 20:43:40 +02:00
parent 598e8db29c
commit 77b754b47f
No known key found for this signature in database
GPG Key ID: 1E050E141B280628
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/newlib/syscalls.c
View File

@ -1,16 +1,8 @@
// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
@ -59,6 +51,10 @@ ssize_t _read_r_console(struct _reent *r, int fd, void * data, size_t size)
break; break;
} }
} }
if (received == 0) {
errno = EWOULDBLOCK;
return -1;
}
return received; return received;
} }
__errno_r(r) = EBADF; __errno_r(r) = EBADF;

1
tools/ci/check_copyright_ignore.txt
View File

@ -1090,7 +1090,6 @@ components/newlib/poll.c
components/newlib/priv_include/esp_time_impl.h components/newlib/priv_include/esp_time_impl.h
components/newlib/pthread.c components/newlib/pthread.c
components/newlib/reent_init.c components/newlib/reent_init.c
components/newlib/syscalls.c
components/newlib/termios.c components/newlib/termios.c
components/newlib/test/test_atomic.c components/newlib/test/test_atomic.c
components/newlib/test/test_locks.c components/newlib/test/test_locks.c