diff options
| -rw-r--r-- | toys/other/stat.c | 24 | ||||
| -rw-r--r-- | toys/posix/find.c | 7 |
2 files changed, 21 insertions, 10 deletions
diff --git a/toys/other/stat.c b/toys/other/stat.c index 3f1d1765..054e2ee7 100644 --- a/toys/other/stat.c +++ b/toys/other/stat.c @@ -20,14 +20,15 @@ config STAT The valid format escape sequences for files: %a Access bits (octal) |%A Access bits (flags)|%b Size/512 - %B Bytes per %b (512) |%d Device ID (dec) |%D Device ID (hex) - %f All mode bits (hex) |%F File type |%g Group ID - %G Group name |%h Hard links |%i Inode - %m Mount point |%n Filename |%N Long filename - %o I/O block size |%s Size (bytes) |%t Devtype major (hex) - %T Devtype minor (hex) |%u User ID |%U User name - %x Access time |%X Access unix time |%y Modification time - %Y Mod unix time |%z Creation time |%Z Creation unix time + %B Bytes per %b (512) |%C Security context |%d Device ID (dec) + %D Device ID (hex) |%f All mode bits (hex)|%F File type + %g Group ID |%G Group name |%h Hard links + %i Inode |%m Mount point |%n Filename + %N Long filename |%o I/O block size |%s Size (bytes) + %t Devtype major (hex) |%T Devtype minor (hex)|%u User ID + %U User name |%x Access time |%X Access unix time + %y Modification time |%Y Mod unix time |%z Creation time + %Z Creation unix time The valid format escape sequences for filesystems: %a Available blocks |%b Total blocks |%c Total inodes @@ -82,7 +83,12 @@ static void print_stat(char type) strout(str); } else if (type == 'b') out('u', stat->st_blocks); else if (type == 'B') out('d', 512); - else if (type == 'd') out('d', stat->st_dev); + else if (type == 'C') { + char *context = NULL; + + strout(lsm_get_context(TT.file, &context) != -1 ? context : "?"); + free(context); + } else if (type == 'd') out('d', stat->st_dev); else if (type == 'D') out('x', stat->st_dev); else if (type == 'f') out('x', stat->st_mode); else if (type == 'F') { diff --git a/toys/posix/find.c b/toys/posix/find.c index 3f24c0dc..fe712c88 100644 --- a/toys/posix/find.c +++ b/toys/posix/find.c @@ -53,7 +53,7 @@ config FIND or "+" (next argument after "{}") to collect and run with multiple files. -printf FORMAT characters are \ escapes and: - %b 512 byte blocks used + %b 512 byte blocks used %f basename %g textual gid %G numeric gid %i decimal inode %l target of symlink %m octal mode %M ls format type/mode %p path to file %P path to file minus DIR @@ -600,6 +600,11 @@ static int do_find(struct dirtree *new) sprintf(buf, "%ld.%ld", new->st.st_mtim.tv_sec, new->st.st_mtim.tv_nsec); ll = (long)buf; + } else if (ch == 'Z') { + char *path = dirtree_path(new, 0); + + ll = (lsm_get_context(path, &ff) != -1) ? (long)ff : (long)"?"; + free(path); } else error_exit("bad -printf %%%c", ch); printf(next, ll); |