kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-29 16:31:18 +01:00
Code Releases Activity

Merge pull request #8552 from gebart/pr/vfs-reserve-stdio-fileno

Browse Source 
sys/vfs: Exclude stdio file numbers from auto allocation
This commit is contained in:
Kaspar Schleiser 2018-02-13 21:49:41 +01:00 committed by GitHub
commit 4947e8a8aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/vfs/vfs.c
View File

@ -21,6 +21,7 @@
#include <sys/stat.h> /* for struct stat */
#include <sys/statvfs.h> /* for struct statvfs */
#include <fcntl.h> /* for O_ACCMODE, ..., fcntl */
#include <unistd.h> /* for STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO */
#include "vfs.h"
#include "mutex.h"
@ -867,6 +868,13 @@ static inline int _allocate_fd(int fd)
{
if (fd < 0) {
for (fd = 0; fd < VFS_MAX_OPEN_FILES; ++fd) {
if ((fd == STDIN_FILENO) || (fd == STDOUT_FILENO) || (fd == STDERR_FILENO)) {
/* Do not auto-allocate the stdio file descriptor numbers to
* avoid conflicts between normal file system users and stdio
* drivers such as uart_stdio, rtt_stdio which need to be able
* to bind to these specific file descriptor numbers. */
continue;
}
if (_vfs_open_files[fd].pid == KERNEL_PID_UNDEF) {
break;
}

4
tests/unittests/tests-vfs/tests-vfs-bind.c
View File

@ -19,6 +19,7 @@
#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include "embUnit/embUnit.h"
@ -71,6 +72,9 @@ static void test_vfs_bind(void)
uint8_t buf[_VFS_TEST_BIND_BUFSIZE];
fd = vfs_bind(VFS_ANY_FD, O_RDWR, &_test_bind_ops, &buf[0]);
TEST_ASSERT(fd >= 0);
TEST_ASSERT(fd != STDIN_FILENO);
TEST_ASSERT(fd != STDOUT_FILENO);
TEST_ASSERT(fd != STDERR_FILENO);
if (fd < 0) {
return;
}