From 0f02032c5da392f8868a6c91f3023a715a3a6ff8 Mon Sep 17 00:00:00 2001 From: Nguyễn Thái Ngọc Duy Date: Tue, 13 Apr 2010 21:55:46 +0200 Subject: win32: ls: skip DESKTOP support as block calculation is not supported EDIT --- coreutils/ls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coreutils/ls.c b/coreutils/ls.c index c7b2161db..717b3f493 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -795,6 +795,7 @@ static void showfiles(struct dnode **dn, unsigned nfiles) } +#if !ENABLE_PLATFORM_MINGW32 #if ENABLE_DESKTOP /* http://www.opengroup.org/onlinepubs/9699919799/utilities/ls.html * If any of the -l, -n, -s options is specified, each list @@ -823,6 +824,7 @@ static off_t calculate_blocks(struct dnode **dn) return blocks >> 1; } #endif +#endif static struct dnode **list_dir(const char *, unsigned *); @@ -848,9 +850,11 @@ static void showdirs(struct dnode **dn, int first) printf("%s:\n", (*dn)->fullname); } subdnp = list_dir((*dn)->fullname, &nfiles); +#if !ENABLE_PLATFORM_MINGW32 #if ENABLE_DESKTOP if ((all_fmt & STYLE_MASK) == STYLE_LONG) printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp)); +#endif #endif if (nfiles > 0) { /* list all files at this level */ -- cgit v1.2.3-55-g6feb