openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

AI 145220: Added "-d" flag to ls. 

Now you can "ls -l -d <directory>" to see directory perms.

Automated import of CL 145220
This commit is contained in:
Andy McFadden 2009-04-08 19:25:35 -07:00 committed by The Android Open Source Project
parent 89efdc9c7f
commit b33d3415b6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toolbox/ls.c
View File

@ -15,9 +15,10 @@
#include <linux/kdev_t.h>
// bits for flags argument
#define LIST_LONG (1 << 0)
#define LIST_ALL (1 << 1)
#define LIST_RECURSIVE (1 << 2)
#define LIST_LONG (1 << 0)
#define LIST_ALL (1 << 1)
#define LIST_RECURSIVE (1 << 2)
#define LIST_DIRECTORIES (1 << 3)
// fwd
static int listpath(const char *name, int flags);
@ -238,7 +239,7 @@ static int listpath(const char *name, int flags)
return -1;
}
if (S_ISDIR(s.st_mode)) {
if ((flags & LIST_DIRECTORIES) == 0 && S_ISDIR(s.st_mode)) {
if (flags & LIST_RECURSIVE)
printf("\n%s:\n", name);
return listdir(name, flags);
@ -269,6 +270,8 @@ int ls_main(int argc, char **argv)
flags |= LIST_ALL;
} else if (!strcmp(argv[i], "-R")) {
flags |= LIST_RECURSIVE;
} else if (!strcmp(argv[i], "-d")) {
flags |= LIST_DIRECTORIES;
} else {
listed++;
if(listpath(argv[i], flags) != 0) {