summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Friedl <Ralf.Friedl@online.de>2011-08-09 02:49:27 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-08-09 02:49:27 (GMT)
commit00103d32879e98c9bba9b6c14fb36d573badc9e0 (patch)
tree951b98b70cc05fed53a71ad6b942f4e39242ca8c
parent98aeabe792ac039b941968efbb4d2d6ef826813d (diff)
downloadbusybox-00103d32879e98c9bba9b6c14fb36d573badc9e0.tar.gz
busybox-00103d32879e98c9bba9b6c14fb36d573badc9e0.tar.bz2
df: more compatible -P behavior
In coreutils df, one of the effects of the option -P is to output everything in one line. This makes it much easier for a script to parse the output of df. This patch adds the same behavior to busybox df. function old new delta df_main 853 863 +10 Signed-off-by: Ralf Friedl <Ralf.Friedl@online.de> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/df.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/df.c b/coreutils/df.c
index 846cb38..63dbd61 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -212,7 +212,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
{
uni_stat_t uni_stat;
char *uni_dev = unicode_conv_to_printable(&uni_stat, device);
- if (uni_stat.unicode_width > 20) {
+ if (uni_stat.unicode_width > 20 && !(opt & OPT_POSIX)) {
printf("%s\n%20s", uni_dev, "");
} else {
printf("%s%*s", uni_dev, 20 - (int)uni_stat.unicode_width, "");
@@ -220,7 +220,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
free(uni_dev);
}
#else
- if (printf("\n%-20s" + 1, device) > 20)
+ if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX))
printf("\n%-20s", "");
#endif