apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-19 19:44:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

nshlib/cmd_dd: Retry if read() was interrupted

Browse Source 
Without this patch

  nsh> ls /etc/group | dd | dd
  sh [13:100]
  sh [14:100]
  nsh: dd: read failed: 4
  nsh>

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
This commit is contained in:
wangjianyu3
2024-11-10 23:18:00 +08:00
committed by Xiang Xiao
parent ebc19a60ff
commit 27b5021e0d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nshlib/nsh_ddcmd.c
View File

@@ -126,6 +126,11 @@ static int dd_read(FAR struct dd_s *dd)
nbytes = read(dd->infd, buffer, dd->sectsize - dd->nbytes); nbytes = read(dd->infd, buffer, dd->sectsize - dd->nbytes);
if (nbytes < 0) if (nbytes < 0)
{ {
if (errno == EINTR)
{
continue;
}
FAR struct nsh_vtbl_s *vtbl = dd->vtbl; FAR struct nsh_vtbl_s *vtbl = dd->vtbl;
nsh_error(vtbl, g_fmtcmdfailed, g_dd, "read", NSH_ERRNO); nsh_error(vtbl, g_fmtcmdfailed, g_dd, "read", NSH_ERRNO);
return ERROR; return ERROR;
@@ -134,7 +139,7 @@ static int dd_read(FAR struct dd_s *dd)
dd->nbytes += nbytes; dd->nbytes += nbytes;
buffer += nbytes; buffer += nbytes;
} }
while (dd->nbytes < dd->sectsize && nbytes > 0); while (dd->nbytes < dd->sectsize && nbytes != 0);
dd->eof |= (dd->nbytes == 0); dd->eof |= (dd->nbytes == 0);
return OK; return OK;