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

Fixed coding std violations in nsh_fsutils.h

Browse Source
This commit is contained in:
Subhra Sankha Sarkar 2020-10-28 18:00:33 +05:30 committed by Xiang Xiao
parent 0d74608b2c
commit 76e58d9e55
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nshlib/nsh_fsutils.c
View File

@ -102,7 +102,7 @@ int nsh_catfile(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
} }
buffer = (FAR char *)malloc(IOBUFFERSIZE); buffer = (FAR char *)malloc(IOBUFFERSIZE);
if(buffer == NULL) if (buffer == NULL)
{ {
close(fd); close(fd);
nsh_error(vtbl, g_fmtcmdfailed, cmd, "malloc", NSH_ERRNO); nsh_error(vtbl, g_fmtcmdfailed, cmd, "malloc", NSH_ERRNO);
@ -111,7 +111,7 @@ int nsh_catfile(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
/* And just dump it byte for byte into stdout */ /* And just dump it byte for byte into stdout */
for (;;) for (; ; )
{ {
int nbytesread = read(fd, buffer, IOBUFFERSIZE); int nbytesread = read(fd, buffer, IOBUFFERSIZE);
@ -129,7 +129,8 @@ int nsh_catfile(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
} }
else else
{ {
nsh_error(vtbl, g_fmtcmdfailed, cmd, "read", NSH_ERRNO_OF(errval)); nsh_error(vtbl, g_fmtcmdfailed, cmd, "read",
NSH_ERRNO_OF(errval));
} }
ret = ERROR; ret = ERROR;
@ -144,7 +145,8 @@ int nsh_catfile(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
while (nbyteswritten < nbytesread) while (nbyteswritten < nbytesread)
{ {
ssize_t n = nsh_write(vtbl, buffer + nbyteswritten, nbytesread - nbyteswritten); ssize_t n = nsh_write(vtbl, buffer + nbyteswritten,
nbytesread - nbyteswritten);
if (n < 0) if (n < 0)
{ {
int errcode = errno; int errcode = errno;
@ -179,18 +181,18 @@ int nsh_catfile(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
} }
} }
/* NOTE that the following NSH prompt may appear on the same line as file /* NOTE that the following NSH prompt may appear on the same line as file
* content. The IEEE Std requires that "The standard output shall * content. The IEEE Std requires that "The standard output shall
* contain the sequence of bytes read from the input files. Nothing else * contain the sequence of bytes read from the input files. Nothing else
* shall be written to the standard output." Reference: * shall be written to the standard output." Reference:
* https://pubs.opengroup.org/onlinepubs/009695399/utilities/cat.html. * https://pubs.opengroup.org/onlinepubs/009695399/utilities/cat.html.
*/ */
/* Close the input file and return the result */ /* Close the input file and return the result */
close(fd); close(fd);
free(buffer); free(buffer);
return ret; return ret;
} }
#endif #endif