diff options
author | Ron Yorston <rmy@pobox.com> | 2014-06-30 21:13:06 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2014-06-30 21:13:06 +0100 |
commit | 099e8b6438345baae560a629d548af07a8c3125c (patch) | |
tree | 71b5600b22b0019af675e4a991394ce32c8207c5 /coreutils/stat.c | |
parent | e19594cc6e49e78fa50a654f15cf9a04e77d054a (diff) | |
parent | 184b2669175e562d58894e22f6320cebf3316c25 (diff) | |
download | busybox-w32-099e8b6438345baae560a629d548af07a8c3125c.tar.gz busybox-w32-099e8b6438345baae560a629d548af07a8c3125c.tar.bz2 busybox-w32-099e8b6438345baae560a629d548af07a8c3125c.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/stat.c')
-rw-r--r-- | coreutils/stat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/coreutils/stat.c b/coreutils/stat.c index dc9d81c35..769fac078 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c | |||
@@ -655,7 +655,7 @@ static bool do_stat(const char *filename, const char *format) | |||
655 | ); | 655 | ); |
656 | # if ENABLE_SELINUX | 656 | # if ENABLE_SELINUX |
657 | if (option_mask32 & OPT_SELINUX) | 657 | if (option_mask32 & OPT_SELINUX) |
658 | printf(" %lc\n", *scontext); | 658 | printf(" %s\n", scontext); |
659 | else | 659 | else |
660 | bb_putchar('\n'); | 660 | bb_putchar('\n'); |
661 | # endif | 661 | # endif |
@@ -700,7 +700,8 @@ static bool do_stat(const char *filename, const char *format) | |||
700 | (unsigned long) statbuf.st_gid, | 700 | (unsigned long) statbuf.st_gid, |
701 | (gw_ent != NULL) ? gw_ent->gr_name : "UNKNOWN"); | 701 | (gw_ent != NULL) ? gw_ent->gr_name : "UNKNOWN"); |
702 | # if ENABLE_SELINUX | 702 | # if ENABLE_SELINUX |
703 | printf(" S_Context: %lc\n", *scontext); | 703 | if (option_mask32 & OPT_SELINUX) |
704 | printf(" S_Context: %s\n", scontext); | ||
704 | # endif | 705 | # endif |
705 | printf("Access: %s\n", human_time(statbuf.st_atime)); | 706 | printf("Access: %s\n", human_time(statbuf.st_atime)); |
706 | printf("Modify: %s\n", human_time(statbuf.st_mtime)); | 707 | printf("Modify: %s\n", human_time(statbuf.st_mtime)); |