aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-11-11 22:25:34 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-11-11 22:25:34 +0000
commit98f5cdfca7401e4e159b73b1efa600ca58fb292d (patch)
treee81d04c59a25577430bb127166ce777804776b84 /coreutils
parentf3c2d1360222f54126e5b0322ae4f8c1853e4782 (diff)
downloadbusybox-98f5cdfca7401e4e159b73b1efa600ca58fb292d.tar.gz
busybox-98f5cdfca7401e4e159b73b1efa600ca58fb292d.tar.bz2
stat: make stat -f show filesystem "ID:" as coreutils does
print_statfs 358 370 +12
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/stat.c27
1 files changed, 21 insertions, 6 deletions
diff --git a/coreutils/stat.c b/coreutils/stat.c
index c34c06acb..4c729e071 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -139,6 +139,20 @@ static void printfs(char *pformat, const char *msg)
printf(pformat, msg);
}
+/* "man statfs" says that statfsbuf->f_fsid is a mess */
+/* coreutils treats it as an array of ints, most significant first */
+static unsigned long long get_f_fsid(const struct statfs *statfsbuf)
+{
+ const unsigned *p = (const void*) &statfsbuf->f_fsid;
+ unsigned sz = sizeof(statfsbuf->f_fsid) / sizeof(unsigned);
+ unsigned long long r = 0;
+
+ do
+ r = (r << (sizeof(unsigned)*8)) | *p++;
+ while (--sz > 0);
+ return r;
+}
+
/* print statfs info */
static void print_statfs(char *pformat, const char m,
const char *const filename, const void *data
@@ -148,11 +162,11 @@ static void print_statfs(char *pformat, const char m,
if (m == 'n') {
printfs(pformat, filename);
} else if (m == 'i') {
- strcat(pformat, "Lx");
- printf(pformat, statfsbuf->f_fsid);
+ strcat(pformat, "llx");
+ printf(pformat, get_f_fsid(statfsbuf));
} else if (m == 'l') {
strcat(pformat, "lu");
- printf(pformat, statfsbuf->f_namelen);
+ printf(pformat, (unsigned long) (statfsbuf->f_namelen));
} else if (m == 't') {
strcat(pformat, "lx");
printf(pformat, (unsigned long) (statfsbuf->f_type)); /* no equiv */
@@ -349,10 +363,11 @@ static void print_it(const char *masterformat, const char *filename,
#endif
static bool do_statfs(const char *filename, const char *format)
{
+ struct statfs statfsbuf;
+
#if !ENABLE_FEATURE_STAT_FORMAT
const char *format;
#endif
- struct statfs statfsbuf;
#if ENABLE_SELINUX
security_context_t scontext = NULL;
@@ -406,10 +421,10 @@ static bool do_statfs(const char *filename, const char *format)
format = (option_mask32 & OPT_TERSE
? "%s %llx %lu "
: " File: \"%s\"\n"
- " ID: %-8Lx Namelen: %-7lu ");
+ " ID: %-8llx Namelen: %-7lu ");
printf(format,
filename,
- statfsbuf.f_fsid,
+ get_f_fsid(&statfsbuf),
statfsbuf.f_namelen);
if (option_mask32 & OPT_TERSE)