emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove superfluous bss user (flags) and manually unswitch some areas:

Browse Source 
text    data     bss     dec     hex filename
   4517       0      34    4551    11c7 stat.o.oorig
   4300       0      30    4330    10ea stat.o
This commit is contained in:
Bernhard Reutner-Fischer 2007-04-04 13:58:33 +00:00
parent 794687947f
commit 0e6ab01c5a
1 changed files with 92 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
coreutils/stat.c
View File

@ -16,12 +16,14 @@
#include "busybox.h" #include "busybox.h"
/* vars to control behavior */ /* vars to control behavior */
#define OPT_TERSE 2 #define OPT_FILESYS (1<<0)
#define OPT_DEREFERENCE 4 #define OPT_TERSE (1<<1)
#define OPT_SELINUX 8 #define OPT_DEREFERENCE (1<<2)
static long flags; #define OPT_SELINUX (1<<3)
static char const *file_type(struct stat const *st) static char buf[sizeof("YYYY-MM-DD HH:MM:SS.000000000")];
static char const * file_type(struct stat const *st)
{ {
/* See POSIX 1003.1-2001 XCU Table 4-8 lines 17093-17107 /* See POSIX 1003.1-2001 XCU Table 4-8 lines 17093-17107
* for some of these formats. * for some of these formats.
@ -53,7 +55,7 @@ static char const *human_time(time_t t)
return str; return str;
*/ */
/* coreutils 6.3 compat: */ /* coreutils 6.3 compat: */
static char buf[sizeof("YYYY-MM-DD HH:MM:SS.000000000")];
strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S.000000000", localtime(&t)); strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S.000000000", localtime(&t));
return buf; return buf;
} }
@ -66,9 +68,9 @@ static char const *human_time(time_t t)
static char const *human_fstype(long f_type) static char const *human_fstype(long f_type)
{ {
int i; int i;
static const struct types { const struct types {
long type; long type;
const char *fs; const char * const fs;
} humantypes[] = { } humantypes[] = {
{ 0xADFF, "affs" }, { 0xADFF, "affs" },
{ 0x1Cd1, "devpts" }, { 0x1Cd1, "devpts" },
@ -115,76 +117,58 @@ static char const *human_fstype(long f_type)
#ifdef CONFIG_FEATURE_STAT_FORMAT #ifdef CONFIG_FEATURE_STAT_FORMAT
/* print statfs info */ /* print statfs info */
static void print_statfs(char *pformat, size_t buf_len, char m, static void print_statfs(char *pformat, const size_t buf_len, const char m,
char const *filename, void const *data const char * const filename, void const *data
USE_SELINUX(,security_context_t scontext) ) USE_SELINUX(, security_context_t scontext))
{ {
struct statfs const *statfsbuf = data; struct statfs const *statfsbuf = data;
if (m == 'n') {
switch (m) {
case 'n':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
printf(pformat, filename); printf(pformat, filename);
break; } else if (m == 'i') {
case 'i':
strncat(pformat, "Lx", buf_len); strncat(pformat, "Lx", buf_len);
printf(pformat, statfsbuf->f_fsid); printf(pformat, statfsbuf->f_fsid);
break; } else if (m == 'l') {
case 'l':
strncat(pformat, "lu", buf_len); strncat(pformat, "lu", buf_len);
printf(pformat, statfsbuf->f_namelen); printf(pformat, statfsbuf->f_namelen);
break; } else if (m == 't') {
case 't':
strncat(pformat, "lx", buf_len); strncat(pformat, "lx", buf_len);
printf(pformat, (unsigned long int) (statfsbuf->f_type)); /* no equiv. */ printf(pformat, (unsigned long int) (statfsbuf->f_type)); /* no equiv */
break; } else if (m == 'T') {
case 'T':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
printf(pformat, human_fstype(statfsbuf->f_type)); printf(pformat, human_fstype(statfsbuf->f_type));
break; } else if (m == 'b') {
case 'b':
strncat(pformat, "jd", buf_len); strncat(pformat, "jd", buf_len);
printf(pformat, (intmax_t) (statfsbuf->f_blocks)); printf(pformat, (intmax_t) (statfsbuf->f_blocks));
break; } else if (m == 'f') {
case 'f':
strncat(pformat, "jd", buf_len); strncat(pformat, "jd", buf_len);
printf(pformat, (intmax_t) (statfsbuf->f_bfree)); printf(pformat, (intmax_t) (statfsbuf->f_bfree));
break; } else if (m == 'a') {
case 'a':
strncat(pformat, "jd", buf_len); strncat(pformat, "jd", buf_len);
printf(pformat, (intmax_t) (statfsbuf->f_bavail)); printf(pformat, (intmax_t) (statfsbuf->f_bavail));
break; } else if (m == 's' || m == 'S') {
case 'S':
case 's':
strncat(pformat, "lu", buf_len); strncat(pformat, "lu", buf_len);
printf(pformat, (unsigned long int) (statfsbuf->f_bsize)); printf(pformat, (unsigned long int) (statfsbuf->f_bsize));
break; } else if (m == 'c') {
case 'c':
strncat(pformat, "jd", buf_len); strncat(pformat, "jd", buf_len);
printf(pformat, (intmax_t) (statfsbuf->f_files)); printf(pformat, (intmax_t) (statfsbuf->f_files));
break; } else if (m == 'd') {
case 'd':
strncat(pformat, "jd", buf_len); strncat(pformat, "jd", buf_len);
printf(pformat, (intmax_t) (statfsbuf->f_ffree)); printf(pformat, (intmax_t) (statfsbuf->f_ffree));
break;
#if ENABLE_SELINUX #if ENABLE_SELINUX
case 'C': } else if (m == 'C' && (option_mask32 & OPT_SELINUX)) {
if (flags & OPT_SELINUX) { strncat(pformat, "s", buf_len);
strncat(pformat, "s", buf_len); printf(scontext);
printf(scontext);
}
break;
#endif #endif
default: } else {
strncat(pformat, "c", buf_len); strncat(pformat, "c", buf_len);
printf(pformat, m); printf(pformat, m);
break;
} }
} }
/* print stat info */ /* print stat info */
static void print_stat(char *pformat, size_t buf_len, char m, static void print_stat(char *pformat, const size_t buf_len, const char m,
char const *filename, void const *data const char * const filename, void const *data
USE_SELINUX(, security_context_t scontext)) USE_SELINUX(, security_context_t scontext))
{ {
#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
@ -192,12 +176,10 @@ static void print_stat(char *pformat, size_t buf_len, char m,
struct passwd *pw_ent; struct passwd *pw_ent;
struct group *gw_ent; struct group *gw_ent;
switch (m) { if (m == 'n') {
case 'n':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
printf(pformat, filename); printf(pformat, filename);
break; } else if (m == 'N') {
case 'N':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
if (S_ISLNK(statbuf->st_mode)) { if (S_ISLNK(statbuf->st_mode)) {
char *linkname = xmalloc_readlink_or_warn(filename); char *linkname = xmalloc_readlink_or_warn(filename);
@ -212,119 +194,90 @@ static void print_stat(char *pformat, size_t buf_len, char m,
} else { } else {
printf(pformat, filename); printf(pformat, filename);
} }
break; } else if (m == 'd') {
case 'd':
strncat(pformat, "ju", buf_len); strncat(pformat, "ju", buf_len);
printf(pformat, (uintmax_t) statbuf->st_dev); printf(pformat, (uintmax_t) statbuf->st_dev);
break; } else if (m == 'D') {
case 'D':
strncat(pformat, "jx", buf_len); strncat(pformat, "jx", buf_len);
printf(pformat, (uintmax_t) statbuf->st_dev); printf(pformat, (uintmax_t) statbuf->st_dev);
break; } else if (m == 'i') {
case 'i':
strncat(pformat, "ju", buf_len); strncat(pformat, "ju", buf_len);
printf(pformat, (uintmax_t) statbuf->st_ino); printf(pformat, (uintmax_t) statbuf->st_ino);
break; } else if (m == 'a') {
case 'a':
strncat(pformat, "lo", buf_len); strncat(pformat, "lo", buf_len);
printf(pformat, (unsigned long int) (statbuf->st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO))); printf(pformat, (unsigned long int) (statbuf->st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)));
break; } else if (m == 'A') {
case 'A':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
printf(pformat, bb_mode_string(statbuf->st_mode)); printf(pformat, bb_mode_string(statbuf->st_mode));
break; } else if (m == 'f') {
case 'f':
strncat(pformat, "lx", buf_len); strncat(pformat, "lx", buf_len);
printf(pformat, (unsigned long int) statbuf->st_mode); printf(pformat, (unsigned long int) statbuf->st_mode);
break; } else if (m == 'F') {
case 'F':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
printf(pformat, file_type(statbuf)); printf(pformat, file_type(statbuf));
break; } else if (m == 'h') {
case 'h':
strncat(pformat, "lu", buf_len); strncat(pformat, "lu", buf_len);
printf(pformat, (unsigned long int) statbuf->st_nlink); printf(pformat, (unsigned long int) statbuf->st_nlink);
break; } else if (m == 'u') {
case 'u':
strncat(pformat, "lu", buf_len); strncat(pformat, "lu", buf_len);
printf(pformat, (unsigned long int) statbuf->st_uid); printf(pformat, (unsigned long int) statbuf->st_uid);
break; } else if (m == 'U') {
case 'U':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
setpwent(); setpwent();
pw_ent = getpwuid(statbuf->st_uid); pw_ent = getpwuid(statbuf->st_uid);
printf(pformat, (pw_ent != 0L) ? pw_ent->pw_name : "UNKNOWN"); printf(pformat, (pw_ent != 0L) ? pw_ent->pw_name : "UNKNOWN");
break; } else if (m == 'g') {
case 'g':
strncat(pformat, "lu", buf_len); strncat(pformat, "lu", buf_len);
printf(pformat, (unsigned long int) statbuf->st_gid); printf(pformat, (unsigned long int) statbuf->st_gid);
break; } else if (m == 'G') {
case 'G':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
setgrent(); setgrent();
gw_ent = getgrgid(statbuf->st_gid); gw_ent = getgrgid(statbuf->st_gid);
printf(pformat, (gw_ent != 0L) ? gw_ent->gr_name : "UNKNOWN"); printf(pformat, (gw_ent != 0L) ? gw_ent->gr_name : "UNKNOWN");
break; } else if (m == 't') {
case 't':
strncat(pformat, "lx", buf_len); strncat(pformat, "lx", buf_len);
printf(pformat, (unsigned long int) major(statbuf->st_rdev)); printf(pformat, (unsigned long int) major(statbuf->st_rdev));
break; } else if (m == 'T') {
case 'T':
strncat(pformat, "lx", buf_len); strncat(pformat, "lx", buf_len);
printf(pformat, (unsigned long int) minor(statbuf->st_rdev)); printf(pformat, (unsigned long int) minor(statbuf->st_rdev));
break; } else if (m == 's') {
case 's':
strncat(pformat, "ju", buf_len); strncat(pformat, "ju", buf_len);
printf(pformat, (uintmax_t) (statbuf->st_size)); printf(pformat, (uintmax_t) (statbuf->st_size));
break; } else if (m == 'B') {
case 'B':
strncat(pformat, "lu", buf_len); strncat(pformat, "lu", buf_len);
printf(pformat, (unsigned long int) 512); //ST_NBLOCKSIZE printf(pformat, (unsigned long int) 512); //ST_NBLOCKSIZE
break; } else if (m == 'b') {
case 'b':
strncat(pformat, "ju", buf_len); strncat(pformat, "ju", buf_len);
printf(pformat, (uintmax_t) statbuf->st_blocks); printf(pformat, (uintmax_t) statbuf->st_blocks);
break; } else if (m == 'o') {
case 'o':
strncat(pformat, "lu", buf_len); strncat(pformat, "lu", buf_len);
printf(pformat, (unsigned long int) statbuf->st_blksize); printf(pformat, (unsigned long int) statbuf->st_blksize);
break; } else if (m == 'x') {
case 'x':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
printf(pformat, human_time(statbuf->st_atime)); printf(pformat, human_time(statbuf->st_atime));
break; } else if (m == 'X') {
case 'X':
strncat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu", buf_len); strncat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu", buf_len);
printf(pformat, (unsigned long int) statbuf->st_atime); printf(pformat, (unsigned long int) statbuf->st_atime);
break; } else if (m == 'y') {
case 'y':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
printf(pformat, human_time(statbuf->st_mtime)); printf(pformat, human_time(statbuf->st_mtime));
break; } else if (m == 'Y') {
case 'Y':
strncat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu", buf_len); strncat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu", buf_len);
printf(pformat, (unsigned long int) statbuf->st_mtime); printf(pformat, (unsigned long int) statbuf->st_mtime);
break; } else if (m == 'z') {
case 'z':
strncat(pformat, "s", buf_len); strncat(pformat, "s", buf_len);
printf(pformat, human_time(statbuf->st_ctime)); printf(pformat, human_time(statbuf->st_ctime));
break; } else if (m == 'Z') {
case 'Z':
strncat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu", buf_len); strncat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu", buf_len);
printf(pformat, (unsigned long int) statbuf->st_ctime); printf(pformat, (unsigned long int) statbuf->st_ctime);
break;
#if ENABLE_SELINUX #if ENABLE_SELINUX
case 'C': } else if (m == 'C' && (option_mask32 & OPT_SELINUX)) {
if (flags & OPT_SELINUX) { strncat(pformat, "s", buf_len);
strncat(pformat, "s", buf_len); printf(pformat, scontext);
printf(pformat, scontext);
}
break;
#endif #endif
default: } else {
strncat(pformat, "c", buf_len); strncat(pformat, "c", buf_len);
printf(pformat, m); printf(pformat, m);
break;
} }
} }
@ -382,14 +335,14 @@ static void print_it(char const *masterformat, char const *filename,
#endif #endif
/* Stat the file system and print what we find. */ /* Stat the file system and print what we find. */
static int do_statfs(char const *filename, char const *format) static bool do_statfs(char const *filename, char const *format)
{ {
struct statfs statfsbuf; struct statfs statfsbuf;
#if ENABLE_SELINUX #if ENABLE_SELINUX
security_context_t scontext = NULL; security_context_t scontext = NULL;
if (flags & OPT_SELINUX) {
if ((flags & OPT_DEREFERENCE ? lgetfilecon(filename, scontext): if (option_mask32 & OPT_SELINUX) {
if ((option_mask32 & OPT_DEREFERENCE ? lgetfilecon(filename, scontext):
getfilecon(filename, scontext))< 0) { getfilecon(filename, scontext))< 0) {
bb_perror_msg(filename); bb_perror_msg(filename);
return 0; return 0;
@ -404,7 +357,7 @@ static int do_statfs(char const *filename, char const *format)
#ifdef CONFIG_FEATURE_STAT_FORMAT #ifdef CONFIG_FEATURE_STAT_FORMAT
if (format == NULL) if (format == NULL)
#ifndef ENABLE_SELINUX #ifndef ENABLE_SELINUX
format = (flags & OPT_TERSE format = (option_mask32 & OPT_TERSE
? "%n %i %l %t %s %b %f %a %c %d\n" ? "%n %i %l %t %s %b %f %a %c %d\n"
: " File: \"%n\"\n" : " File: \"%n\"\n"
" ID: %-8i Namelen: %-7l Type: %T\n" " ID: %-8i Namelen: %-7l Type: %T\n"
@ -413,10 +366,10 @@ static int do_statfs(char const *filename, char const *format)
"Inodes: Total: %-10c Free: %d"); "Inodes: Total: %-10c Free: %d");
print_it(format, filename, print_statfs, &statfsbuf USE_SELINUX(, scontext)); print_it(format, filename, print_statfs, &statfsbuf USE_SELINUX(, scontext));
#else #else
format = (flags & OPT_TERSE format = (option_mask32 & OPT_TERSE
? (flags & OPT_SELINUX ? "%n %i %l %t %s %b %f %a %c %d %C\n": ? (option_mask32 & OPT_SELINUX ? "%n %i %l %t %s %b %f %a %c %d %C\n":
"%n %i %l %t %s %b %f %a %c %d\n") "%n %i %l %t %s %b %f %a %c %d\n")
: (flags & OPT_SELINUX ? : (option_mask32 & OPT_SELINUX ?
" File: \"%n\"\n" " File: \"%n\"\n"
" ID: %-8i Namelen: %-7l Type: %T\n" " ID: %-8i Namelen: %-7l Type: %T\n"
"Block size: %-10s\n" "Block size: %-10s\n"
@ -432,7 +385,7 @@ static int do_statfs(char const *filename, char const *format)
print_it(format, filename, print_statfs, &statfsbuf USE_SELINUX(, scontext)); print_it(format, filename, print_statfs, &statfsbuf USE_SELINUX(, scontext));
#endif /* SELINUX */ #endif /* SELINUX */
#else /* FEATURE_STAT_FORMAT */ #else /* FEATURE_STAT_FORMAT */
format = (flags & OPT_TERSE format = (option_mask32 & OPT_TERSE
? "%s %llx %lu " ? "%s %llx %lu "
: " File: \"%s\"\n" : " File: \"%s\"\n"
" ID: %-8Lx Namelen: %-7lu "); " ID: %-8Lx Namelen: %-7lu ");
@ -441,13 +394,13 @@ static int do_statfs(char const *filename, char const *format)
statfsbuf.f_fsid, statfsbuf.f_fsid,
statfsbuf.f_namelen); statfsbuf.f_namelen);
if (flags & OPT_TERSE) if (option_mask32 & OPT_TERSE)
printf("%lx ", (unsigned long int) (statfsbuf.f_type)); printf("%lx ", (unsigned long int) (statfsbuf.f_type));
else else
printf("Type: %s\n", human_fstype(statfsbuf.f_type)); printf("Type: %s\n", human_fstype(statfsbuf.f_type));
#if !ENABLE_SELINUX #if !ENABLE_SELINUX
format = (flags & OPT_TERSE format = (option_mask32 & OPT_TERSE
? "%lu %ld %ld %ld %ld %ld\n" ? "%lu %ld %ld %ld %ld %ld\n"
: "Block size: %-10lu\n" : "Block size: %-10lu\n"
"Blocks: Total: %-10jd Free: %-10jd Available: %jd\n" "Blocks: Total: %-10jd Free: %-10jd Available: %jd\n"
@ -460,10 +413,10 @@ static int do_statfs(char const *filename, char const *format)
(intmax_t) (statfsbuf.f_files), (intmax_t) (statfsbuf.f_files),
(intmax_t) (statfsbuf.f_ffree)); (intmax_t) (statfsbuf.f_ffree));
#else #else
format = (flags & OPT_TERSE format = (option_mask32 & OPT_TERSE
? (flags & OPT_SELINUX ? "%lu %ld %ld %ld %ld %ld %C\n": ? (option_mask32 & OPT_SELINUX ? "%lu %ld %ld %ld %ld %ld %C\n":
"%lu %ld %ld %ld %ld %ld\n") "%lu %ld %ld %ld %ld %ld\n")
: (flags & OPT_SELINUX ? : (option_mask32 & OPT_SELINUX ?
"Block size: %-10lu\n" "Block size: %-10lu\n"
"Blocks: Total: %-10jd Free: %-10jd Available: %jd\n" "Blocks: Total: %-10jd Free: %-10jd Available: %jd\n"
"Inodes: Total: %-10jd Free: %jd" "Inodes: Total: %-10jd Free: %jd"
@ -488,20 +441,21 @@ static int do_statfs(char const *filename, char const *format)
} }
/* stat the file and print what we find */ /* stat the file and print what we find */
static int do_stat(char const *filename, char const *format) static bool do_stat(char const *filename, char const *format)
{ {
struct stat statbuf; struct stat statbuf;
#if ENABLE_SELINUX #if ENABLE_SELINUX
security_context_t scontext = NULL; security_context_t scontext = NULL;
if (flags & OPT_SELINUX) {
if ((flags & OPT_DEREFERENCE ? lgetfilecon(filename, scontext): if (option_mask32 & OPT_SELINUX) {
if ((option_mask32 & OPT_DEREFERENCE ? lgetfilecon(filename, scontext):
getfilecon(filename, scontext))< 0) { getfilecon(filename, scontext))< 0) {
bb_perror_msg (filename); bb_perror_msg (filename);
return 0; return 0;
} }
} }
#endif #endif
if ((flags & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) { if ((option_mask32 & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) {
bb_perror_msg("cannot stat '%s'", filename); bb_perror_msg("cannot stat '%s'", filename);
return 0; return 0;
} }
@ -509,7 +463,7 @@ static int do_stat(char const *filename, char const *format)
#ifdef CONFIG_FEATURE_STAT_FORMAT #ifdef CONFIG_FEATURE_STAT_FORMAT
if (format == NULL) { if (format == NULL) {
#ifndef ENABLE_SELINUX #ifndef ENABLE_SELINUX
if (flags & OPT_TERSE) { if (option_mask32 & OPT_TERSE) {
format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o"; format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o";
} else { } else {
if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) { if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) {
@ -530,13 +484,13 @@ static int do_stat(char const *filename, char const *format)
} }
} }
#else #else
if (flags & OPT_TERSE) { if (option_mask32 & OPT_TERSE) {
format = (flags & OPT_SELINUX ? format = (option_mask32 & OPT_SELINUX ?
"%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n": "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n":
"%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n"); "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n");
} else { } else {
if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) { if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) {
format = (flags & OPT_SELINUX ? format = (option_mask32 & OPT_SELINUX ?
" File: \"%N\"\n" " File: \"%N\"\n"
" Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
"Device: %Dh/%dd\tInode: %-10i Links: %-5h" "Device: %Dh/%dd\tInode: %-10i Links: %-5h"
@ -551,7 +505,7 @@ static int do_stat(char const *filename, char const *format)
"Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n"
"Access: %x\n" "Modify: %y\n" "Change: %z\n"); "Access: %x\n" "Modify: %y\n" "Change: %z\n");
} else { } else {
format = (flags & OPT_SELINUX ? format = (option_mask32 & OPT_SELINUX ?
" File: \"%N\"\n" " File: \"%N\"\n"
" Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
"Device: %Dh/%dd\tInode: %-10i Links: %h\n" "Device: %Dh/%dd\tInode: %-10i Links: %h\n"
@ -569,7 +523,7 @@ static int do_stat(char const *filename, char const *format)
} }
print_it(format, filename, print_stat, &statbuf USE_SELINUX(, scontext)); print_it(format, filename, print_stat, &statbuf USE_SELINUX(, scontext));
#else /* FEATURE_STAT_FORMAT */ #else /* FEATURE_STAT_FORMAT */
if (flags & OPT_TERSE) { if (option_mask32 & OPT_TERSE) {
printf("%s %ju %ju %lx %lu %lu %jx %ju %lu %lx %lx %lu %lu %lu %lu" printf("%s %ju %ju %lx %lu %lu %jx %ju %lu %lx %lx %lu %lu %lu %lu"
SKIP_SELINUX("\n"), SKIP_SELINUX("\n"),
filename, filename,
@ -589,7 +543,7 @@ static int do_stat(char const *filename, char const *format)
(unsigned long int) statbuf.st_blksize (unsigned long int) statbuf.st_blksize
); );
#if ENABLE_SELINUX #if ENABLE_SELINUX
if (flags & OPT_SELINUX) if (option_mask32 & OPT_SELINUX)
printf(" %lc\n", *scontext); printf(" %lc\n", *scontext);
else else
putchar('\n'); putchar('\n');
@ -649,23 +603,23 @@ static int do_stat(char const *filename, char const *format)
int stat_main(int argc, char **argv); int stat_main(int argc, char **argv);
int stat_main(int argc, char **argv) int stat_main(int argc, char **argv)
{ {
int i;
char *format = NULL; char *format = NULL;
int i;
int ok = 1; int ok = 1;
int (*statfunc)(char const *, char const *) = do_stat; bool (*statfunc)(char const *, char const *) = do_stat;
flags = getopt32(argc, argv, "ftL" getopt32(argc, argv, "ftL"
USE_SELINUX("Z") USE_SELINUX("Z")
USE_FEATURE_STAT_FORMAT("c:", &format) USE_FEATURE_STAT_FORMAT("c:", &format)
); );
if (flags & 1) /* -f */ if (option_mask32 & OPT_FILESYS) /* -f */
statfunc = do_statfs; statfunc = do_statfs;
if (argc == optind) /* files */ if (argc == optind) /* files */
bb_show_usage(); bb_show_usage();
#if ENABLE_SELINUX #if ENABLE_SELINUX
if (flags & OPT_SELINUX) { if (option_mask32 & OPT_SELINUX) {
selinux_or_die(); selinux_or_die();
} }
#endif /* ENABLE_SELINUX */ #endif /* ENABLE_SELINUX */