diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-07-26 22:39:56 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-26 22:39:56 +0000 |
| commit | 726b2cb5da41dc13557f5bdbf5db242e3515c544 (patch) | |
| tree | 20e684d294d8ee21e4c48cf1ad596d127e6dd472 | |
| parent | 14290179688f7aa2d9c57dc4e9987d72a6e8a3b8 (diff) | |
| download | busybox-726b2cb5da41dc13557f5bdbf5db242e3515c544.tar.gz | |
just punt all the f_frsize crap since not all linux headers support it Bug 346
| -rw-r--r-- | coreutils/stat.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/coreutils/stat.c b/coreutils/stat.c index b41e1d3be..4afe249c0 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c @@ -37,10 +37,6 @@ #include <string.h> #include "busybox.h" -#ifdef __linux__ -# include <linux/version.h> -#endif - /* vars to control behavior */ #define OPT_TERSE 2 #define OPT_DEREFERNCE 4 @@ -173,23 +169,11 @@ static void print_statfs(char *pformat, size_t buf_len, char m, strncat(pformat, "ld", buf_len); printf(pformat, (intmax_t) (statfsbuf->f_bavail)); break; + case 'S': case 's': strncat(pformat, "lu", buf_len); printf(pformat, (unsigned long int) (statfsbuf->f_bsize)); break; - case 'S': { - unsigned long int frsize; -#if defined(__linux__) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - frsize = statfsbuf->f_frsize; - if (!frsize) - frsize = statfsbuf->f_bsize; -#else - frsize = statfsbuf->f_bsize; -#endif - strncat(pformat, "lu", buf_len); - printf(pformat, frsize); - break; - } case 'c': strncat(pformat, "ld", buf_len); printf(pformat, (intmax_t) (statfsbuf->f_files)); @@ -407,10 +391,10 @@ static int do_statfs(char const *filename, char const *format) #ifdef CONFIG_FEATURE_STAT_FORMAT if (format == NULL) format = (flags & OPT_TERSE - ? "%n %i %l %t %s %S %b %f %a %c %d\n" + ? "%n %i %l %t %s %b %f %a %c %d\n" : " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" - "Block size: %-10s Fundamental block size: %S\n" + "Block size: %-10s\n" "Blocks: Total: %-10b Free: %-10f Available: %a\n" "Inodes: Total: %-10c Free: %d\n"); print_it(format, filename, print_statfs, &statfsbuf); @@ -431,13 +415,12 @@ static int do_statfs(char const *filename, char const *format) printf("Type: %s\n", human_fstype(statfsbuf.f_type)); format = (flags & OPT_TERSE - ? "%lu %lu %ld %ld %ld %ld %ld\n" - : "Block size: %-10lu Fundamental block size: %lu\n" + ? "%lu %ld %ld %ld %ld %ld\n" + : "Block size: %-10lu\n" "Blocks: Total: %-10ld Free: %-10ld Available: %ld\n" "Inodes: Total: %-10ld Free: %ld\n"); printf(format, (unsigned long int) (statfsbuf.f_bsize), - statfsbuf.f_frsize ? statfsbuf.f_frsize : statfsbuf.f_bsize, (intmax_t) (statfsbuf.f_blocks), (intmax_t) (statfsbuf.f_bfree), (intmax_t) (statfsbuf.f_bavail), |