Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nshlib: add -f for umount

Browse source 
adds support for the -f (force) option to the NSH umount command

Signed-off-by: zhengyu16 <zhengyu16@xiaomi.com>
This commit is contained in:
zhengyu16 2025-09-11 05:16:12 -04:00 • committed by Xiang Xiao
parent dbc99dbf35
commit cfff7f5a22
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nshlib/nsh_command.c
View file

@ -621,7 +621,7 @@ static const struct cmdmap_s g_cmdmap[] =
#if !defined(CONFIG_DISABLE_MOUNTPOINT)
# ifndef CONFIG_NSH_DISABLE_UMOUNT
CMD_MAP("umount", cmd_umount, 2, 2, "<dir-path>"),
CMD_MAP("umount", cmd_umount, 2, 3, "[-f] <dir-path>"),
# endif
#endif

29
nshlib/nsh_mntcmds.c
View file

@ -363,16 +363,37 @@ int cmd_nfsmount(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
#if !defined(CONFIG_DISABLE_MOUNTPOINT) && !defined(CONFIG_NSH_DISABLE_UMOUNT)
int cmd_umount(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
{
UNUSED(argc);
FAR char *fullpath = nsh_getfullpath(vtbl, argv[1]);
unsigned int flags = 0;
FAR char *fullpath;
int ret = ERROR;
int option;
while ((option = getopt(argc, argv, "f")) != ERROR)
{
switch (option)
{
case 'f':
flags |= MNT_FORCE;
break;
default:
nsh_error(vtbl, g_fmtarginvalid, argv[0]);
return ERROR;
}
}
if (optind >= argc)
{
nsh_error(vtbl, g_fmtargrequired, argv[0]);
return ret;
}
fullpath = nsh_getfullpath(vtbl, argv[optind]);
if (fullpath)
{
/* Perform the umount */
ret = umount(fullpath);
ret = umount2(fullpath, flags);
if (ret < 0)
{
nsh_error(vtbl, g_fmtcmdfailed, argv[0], "umount", NSH_ERRNO);