tree: Minor cleanup, also does not need sudo for tests.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2015-08-23 05:23:54 +02:00
1 parent 42b6a03317
commit a157fe4162
2 files changed
+3 -7

No files matched your search

+3 -6
View File
@@ -43,7 +43,6 @@ static void get_perms(struct stat *st, char *buf, size_t len)
{ {
mode_t m = st->st_mode; mode_t m = st->st_mode;
// printf("%#o\n", m);
snprintf(buf, len, "[%c%c%c%c%c%c%c%c%c%c] ", snprintf(buf, len, "[%c%c%c%c%c%c%c%c%c%c] ",
S_ISCHR(m) ? 'c' : S_ISBLK(m) ? 'b' : S_ISFIFO(m) ? 'p' : S_ISLNK(m) ? 'l' : S_ISSOCK(m) ? 's' : '-', S_ISCHR(m) ? 'c' : S_ISBLK(m) ? 'b' : S_ISFIFO(m) ? 'p' : S_ISLNK(m) ? 'l' : S_ISSOCK(m) ? 's' : '-',
(m & S_IRUSR) ? 'r' : '-', (m & S_IRUSR) ? 'r' : '-',
@@ -58,7 +57,7 @@ static void get_perms(struct stat *st, char *buf, size_t len)
); );
} }
static int descend(char *path, int perms, char *pfx) static int descend(char *path, int show_perms, char *pfx)
{ {
int result = 0; int result = 0;
struct stat st; struct stat st;
@@ -87,10 +86,8 @@ static int descend(char *path, int perms, char *pfx)
snprintf(buf, sizeof(buf), "%s/%s", path, namelist[i]->d_name); snprintf(buf, sizeof(buf), "%s/%s", path, namelist[i]->d_name);
if (!lstat(buf, &st)) { if (!lstat(buf, &st)) {
if (perms) { if (show_perms)
// printf("buf: %s --> ", buf);
get_perms(&st, p, sizeof(p)); get_perms(&st, p, sizeof(p));
}
if ((st.st_mode & S_IFMT) == S_IFDIR) if ((st.st_mode & S_IFMT) == S_IFDIR)
t = '/'; t = '/';
if (S_ISLNK(st.st_mode)) { if (S_ISLNK(st.st_mode)) {
@@ -102,7 +99,7 @@ static int descend(char *path, int perms, char *pfx)
printf("%s%s%c%s\n", p, namelist[i]->d_name, t, s); printf("%s%s%c%s\n", p, namelist[i]->d_name, t, s);
if (t == '/') if (t == '/')
result += descend(buf, perms, dir); result += descend(buf, show_perms, dir);
free(namelist[i]); free(namelist[i]);
} }
-1
View File
@@ -1,5 +1,4 @@
OBJS = OBJS =
ASROOT = 1
TARGET = clean $(OBJS) tree.test TARGET = clean $(OBJS) tree.test
include rules.mk include rules.mk