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

Merged nuttx/apps into master

Browse Source
This commit is contained in:
Masayuki Ishikawa 2017-05-23 16:00:52 +09:00
commit f766ab3775
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nshlib/nsh_dbgcmds.c
View File

@ -395,6 +395,7 @@ int cmd_hexdump(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
buffer = (FAR uint8_t *)malloc(IOBUFFERSIZE); buffer = (FAR uint8_t *)malloc(IOBUFFERSIZE);
if(buffer == NULL) if(buffer == NULL)
{ {
(void)close(fd);
nsh_output(vtbl, g_fmtcmdfailed, "hexdump", "malloc", NSH_ERRNO); nsh_output(vtbl, g_fmtcmdfailed, "hexdump", "malloc", NSH_ERRNO);
return ERROR; return ERROR;
} }

6
tools/mkkconfig.bat
View File

@ -75,6 +75,9 @@ REM GOTO :End
REM ) REM )
) )
REM Get the current directory
SET APPSDIR=%~dp0
Echo # > %kconfig% Echo # > %kconfig%
Echo # For a description of the syntax of this configuration file, >> %kconfig% Echo # For a description of the syntax of this configuration file, >> %kconfig%
Echo # see the file kconfig-language.txt in the NuttX tools repository. >> %kconfig% Echo # see the file kconfig-language.txt in the NuttX tools repository. >> %kconfig%
@ -89,10 +92,9 @@ IF %menu% NEQ "" (
DIR /B /A:D >_tmp_.dat DIR /B /A:D >_tmp_.dat
Echo source "$APPSDIR/builtin/Kconfig" >> %kconfig%
FOR /F "tokens=*" %%s IN (_tmp_.dat) do ( FOR /F "tokens=*" %%s IN (_tmp_.dat) do (
IF EXIST %%s\Kconfig ( IF EXIST %%s\Kconfig (
Echo source "$APPSDIR/%%s/Kconfig" >> %kconfig% Echo source "%APPSDIR%/%%s/Kconfig" >> %kconfig%
) )
) )
DEL _tmp_.dat DEL _tmp_.dat