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

nshlib: Remove the remaining CONFIG_FILE_STREAM dependence

Browse Source 
continue the change from https://github.com/apache/nuttx-apps/pull/1559

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2023-02-22 06:08:13 +08:00
committed by GUIDINGLI
parent 80feb2432d
commit 359f66ad37
23 changed files with 33 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nshlib/nsh_modcmds.c
View File

@@ -24,10 +24,11 @@
#include <nuttx/config.h>
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
#include <nuttx/module.h>
#include <system/readline.h>
#include "nsh.h"
#include "nsh_console.h"
@@ -103,18 +104,18 @@ int cmd_rmmod(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MODULE)
int cmd_lsmod(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
{
UNUSED(argc);
int fd;
FILE *stream;
UNUSED(argc);
/* Usage: lsmod */
/* Open /proc/modules */
stream = fopen("/proc/modules", "r");
if (stream == NULL)
fd = open("/proc/modules", O_RDONLY);
if (fd < 0)
{
nsh_error(vtbl, g_fmtcmdfailed, argv[0], "fopen", NSH_ERRNO);
nsh_error(vtbl, g_fmtcmdfailed, argv[0], "open", NSH_ERRNO);
return ERROR;
}
@@ -126,7 +127,7 @@ int cmd_lsmod(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
/* Read each line from the procfs "file" */
while (fgets(vtbl->iobuffer, IOBUFFERSIZE, stream) != NULL)
while (readline_fd(vtbl->iobuffer, IOBUFFERSIZE, fd, -1) >= 0)
{
FAR char *modulename;
FAR char *initializer;
@@ -175,7 +176,7 @@ int cmd_lsmod(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
datasize ? datasize : "");
}
fclose(stream);
close(fd);
return OK;
}
#endif /* CONFIG_FS_PROCFS && !CONFIG_FS_PROCFS_EXCLUDE_MODULE */