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

nshlib: support list numeric user and group IDs

Browse Source 
Signed-off-by: fangxinyong <fangxinyong@xiaomi.com>
This commit is contained in:
fangxinyong 2023-04-24 11:39:00 +08:00 committed by Xiang Xiao
parent 3b2b73de88
commit 2234c3a2e6
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
nshlib/nsh_fscmds.c
View File

@ -86,6 +86,7 @@
#define LSFLAGS_SIZE 1 #define LSFLAGS_SIZE 1
#define LSFLAGS_LONG 2 #define LSFLAGS_LONG 2
#define LSFLAGS_RECURSIVE 4 #define LSFLAGS_RECURSIVE 4
#define LSFLAGS_UID_GID 8
#define LSFLAGS_HUMANREADBLE 16 #define LSFLAGS_HUMANREADBLE 16
#define KB (1UL << 10) #define KB (1UL << 10)
@ -125,10 +126,12 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,
/* Check if any options will require that we stat the file */ /* Check if any options will require that we stat the file */
if ((lsflags & (LSFLAGS_SIZE | LSFLAGS_LONG)) != 0) if ((lsflags & (LSFLAGS_SIZE | LSFLAGS_LONG | LSFLAGS_UID_GID)) != 0)
{ {
struct stat buf; struct stat buf;
memset(&buf, 0, sizeof(struct stat));
/* stat the file */ /* stat the file */
if (entryp != NULL) if (entryp != NULL)
@ -219,7 +222,15 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,
details[2] = 'w'; details[2] = 'w';
} }
if ((buf.st_mode & S_IXUSR) != 0) if ((buf.st_mode & S_IXUSR) != 0 && (buf.st_mode & S_ISUID) != 0)
{
details[3] = 's';
}
else if ((buf.st_mode & S_ISUID) != 0)
{
details[3] = 'S';
}
else if ((buf.st_mode & S_IXUSR) != 0)
{ {
details[3] = 'x'; details[3] = 'x';
} }
@ -234,7 +245,15 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,
details[5] = 'w'; details[5] = 'w';
} }
if ((buf.st_mode & S_IXGRP) != 0) if ((buf.st_mode & S_IXGRP) != 0 && (buf.st_mode & S_ISGID) != 0)
{
details[6] = 's';
}
else if ((buf.st_mode & S_ISGID) != 0)
{
details[6] = 'S';
}
else if ((buf.st_mode & S_IXGRP) != 0)
{ {
details[6] = 'x'; details[6] = 'x';
} }
@ -257,6 +276,14 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,
nsh_output(vtbl, " %s", details); nsh_output(vtbl, " %s", details);
} }
#ifdef CONFIG_SCHED_USER_IDENTITY
if ((lsflags & LSFLAGS_UID_GID) != 0)
{
nsh_output(vtbl, "%8d", buf.st_uid);
nsh_output(vtbl, "%8d", buf.st_gid);
}
#endif
if ((lsflags & LSFLAGS_SIZE) != 0) if ((lsflags & LSFLAGS_SIZE) != 0)
{ {
if (lsflags & LSFLAGS_HUMANREADBLE && buf.st_size >= KB) if (lsflags & LSFLAGS_HUMANREADBLE && buf.st_size >= KB)
@ -1340,7 +1367,7 @@ int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
switch (option) switch (option)
{ {
case 'l': case 'l':
lsflags |= (LSFLAGS_SIZE | LSFLAGS_LONG); lsflags |= (LSFLAGS_SIZE | LSFLAGS_LONG | LSFLAGS_UID_GID);
break; break;
case 'R': case 'R':