Skip to content

【修复】 修复dup系统调用对用户态的返回值问题 #9324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 25, 2024
Merged

【修复】 修复dup系统调用对用户态的返回值问题 #9324

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c19ef05
fix_return
zhuzhuzhus Aug 21, 2024
b401cb4
fix
zhuzhuzhus Aug 21, 2024
d5c5d59
Update components/dfs/dfs_v2/src/dfs.c
zhuzhuzhus Aug 25, 2024
6faf212
Update components/dfs/dfs_v2/src/dfs.c
zhuzhuzhus Aug 25, 2024
626a53a
Merge branch 'master' into dup
zhuzhuzhus Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions components/dfs/dfs_v2/src/dfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@ int dfs_dup(int oldfd, int startfd)
fdt = dfs_fdtable_get();
if ((oldfd < 0) || (oldfd >= fdt->maxfd))
{
rt_set_errno(-EBADF);
goto exit;
}
if (!fdt->fds[oldfd])
Expand Down Expand Up @@ -668,12 +669,17 @@ sysret_t sys_dup(int oldfd)
int sys_dup(int oldfd)
#endif
{
int err = 0;
int newfd = dfs_dup(oldfd, (dfs_fdtable_get() == &_fdtab) ? DFS_STDIO_OFFSET : 0);
if(newfd < 0)
{
err = rt_get_errno();
}

#ifdef RT_USING_SMART
return (sysret_t)newfd;
return err < 0 ? err : newfd;
#else
return newfd;
return err < 0 ? err : newfd;
#endif
}

Expand Down
Loading