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

du: use long long for size field

Browse Source 
du has issues with files reporting large block counts on
32-bit systems with 4 byte longs.  From looking at the stat.c code, it
seems the preference is to use 'long long', rather than blkcnt_t.

function                                             old     new   delta
du                                                   420     444     +24
du_main                                              317     321      +4
print                                                 43      41      -2
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 28/-2)              Total: 26 bytes

Signed-off-by: Ian Wienand <ianw@vmware.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ian Wienand 2012-02-28 03:10:31 +01:00 committed by Denys Vlasenko
parent fc4ebd0d0b
commit 694738f4eb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
coreutils/du.c
View File

@ -91,7 +91,7 @@ struct globals {
#define INIT_G() do { } while (0) #define INIT_G() do { } while (0)
static void print(unsigned long size, const char *filename) static void print(unsigned long long size, const char *filename)
{ {
/* TODO - May not want to defer error checking here. */ /* TODO - May not want to defer error checking here. */
#if ENABLE_FEATURE_HUMAN_READABLE #if ENABLE_FEATURE_HUMAN_READABLE
@ -105,15 +105,15 @@ static void print(unsigned long size, const char *filename)
size++; size++;
size >>= 1; size >>= 1;
} }
printf("%lu\t%s\n", size, filename); printf("%llu\t%s\n", size, filename);
#endif #endif
} }
/* tiny recursive du */ /* tiny recursive du */
static unsigned long du(const char *filename) static unsigned long long du(const char *filename)
{ {
struct stat statbuf; struct stat statbuf;
unsigned long sum; unsigned long long sum;
if (lstat(filename, &statbuf) != 0) { if (lstat(filename, &statbuf) != 0) {
bb_simple_perror_msg(filename); bb_simple_perror_msg(filename);
@ -190,7 +190,7 @@ static unsigned long du(const char *filename)
int du_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int du_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int du_main(int argc UNUSED_PARAM, char **argv) int du_main(int argc UNUSED_PARAM, char **argv)
{ {
unsigned long total; unsigned long long total;
int slink_depth_save; int slink_depth_save;
unsigned opt; unsigned opt;