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

df: more compatible -P behavior

Browse Source 
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>
This commit is contained in:
Ralf Friedl 2011-08-09 04:49:27 +02:00 committed by Denys Vlasenko
parent 98aeabe792
commit 00103d3287
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coreutils/df.c
View File

@ -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