[PATCH] df option -P
Denys Vlasenko
vda.linux at googlemail.com
Tue Aug 9 02:50:17 UTC 2011
On Tuesday 19 July 2011 17:08, Ralf Friedl wrote:
> Hi
>
> 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.
>
> Ralf
>
> 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
This patch is whitespace-damaged.
Fixed and applied it.
--
vda
More information about the busybox
mailing list