fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

du: Use uintmax_t instead of size_t

Browse Source 
Fixes wraparound for files greater than 4G on 32-bit systems.
This commit is contained in:
Dionysis Grigoropoulos 2015-04-28 12:25:13 +03:00 committed by sin
parent 2d6cde1862
commit a04da01160
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
du.c
View File

@ -19,15 +19,15 @@ static int sflag = 0;
static int hflag = 0; static int hflag = 0;
static void static void
printpath(size_t n, const char *path) printpath(uintmax_t n, const char *path)
{ {
if (hflag) if (hflag)
printf("%s\t%s\n", humansize(n * blksize), path); printf("%s\t%s\n", humansize(n * blksize), path);
else else
printf("%zu\t%s\n", n, path); printf("%ju\t%s\n", n, path);
} }
static size_t static uintmax_t
nblks(blkcnt_t blocks) nblks(blkcnt_t blocks)
{ {
return (512 * blocks + blksize - 1) / blksize; return (512 * blocks + blksize - 1) / blksize;
@ -36,11 +36,11 @@ nblks(blkcnt_t blocks)
static void static void
du(const char *path, struct stat *st, void *total, struct recursor *r) du(const char *path, struct stat *st, void *total, struct recursor *r)
{ {
size_t subtotal = 0; uintmax_t subtotal = 0;
if (st && S_ISDIR(st->st_mode)) if (st && S_ISDIR(st->st_mode))
recurse(path, &subtotal, r); recurse(path, &subtotal, r);
*((size_t *)total) += subtotal + nblks(st ? st->st_blocks : 0); *((uintmax_t *)total) += subtotal + nblks(st ? st->st_blocks : 0);
if (!sflag && r->depth <= maxdepth && r->depth && st && (S_ISDIR(st->st_mode) || aflag)) if (!sflag && r->depth <= maxdepth && r->depth && st && (S_ISDIR(st->st_mode) || aflag))
printpath(subtotal + nblks(st->st_blocks), path); printpath(subtotal + nblks(st->st_blocks), path);
@ -57,7 +57,7 @@ main(int argc, char *argv[])
{ {
struct recursor r = { .fn = du, .hist = NULL, .depth = 0, .maxdepth = 0, struct recursor r = { .fn = du, .hist = NULL, .depth = 0, .maxdepth = 0,
.follow = 'P', .flags = 0 }; .follow = 'P', .flags = 0 };
size_t n = 0; uintmax_t n = 0;
int kflag = 0, dflag = 0; int kflag = 0, dflag = 0;
char *bsize; char *bsize;