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

NSH: Extend ls command to show type of symbolic link.

Browse Source
This commit is contained in:
Gregory Nutt 2017-02-03 11:21:37 -06:00
parent 05cecdd4e8
commit 51f71304d1
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nshlib/nsh_fscmds.c
View File

@ -178,21 +178,40 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,
if ((lsflags & LSFLAGS_LONG) != 0) if ((lsflags & LSFLAGS_LONG) != 0)
{ {
char details[] = "----------"; char details[] = "----------";
#ifdef CONFIG_PSEUDOFS_SOFTLINKS
/* Temporary kludge: stat does not return link type because it
* follows the link and returns the type of the link target.
* readdir(), however, does correctly return the correct type of
* the symbolic link.
*/
if (DIRENT_ISLINK(entryp->d_type))
{
details[0] = 'l';
}
else
#endif
if (S_ISDIR(buf.st_mode)) if (S_ISDIR(buf.st_mode))
{ {
details[0]='d'; details[0] = 'd';
} }
else if (S_ISCHR(buf.st_mode)) else if (S_ISCHR(buf.st_mode))
{ {
details[0]='c'; details[0] = 'c';
} }
else if (S_ISBLK(buf.st_mode)) else if (S_ISBLK(buf.st_mode))
{ {
details[0]='b'; details[0] = 'b';
} }
#if 0 /* ifdef CONFIG_PSEUDOFS_SOFTLINKS See Kludge above. */
else if (S_ISLNK(buf.st_mode))
{
details[0] = 'l';
}
#endif
else if (!S_ISREG(buf.st_mode)) else if (!S_ISREG(buf.st_mode))
{ {
details[0]='?'; details[0] = '?';
} }
if ((buf.st_mode & S_IRUSR) != 0) if ((buf.st_mode & S_IRUSR) != 0)