[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    Re: [PATCH] df: fix -T option when ENABLE_FEATURE_HUMAN_READABLE=0.
From:       Denys Vlasenko <vda.linux () googlemail ! com>
Date:       2014-09-20 16:56:35
Message-ID: CAK1hOcOGASDU7eN2yY3+LYTbjBzRt1MvaMrUMwr_FbhUBCro1g () mail ! gmail ! com
[Download RAW message or body]

On Thu, Sep 18, 2014 at 2:41 PM, Ari Sundholm <ari@tuxera.com> wrote:
> From: Ari Sundholm <ari@tuxera.com>
>
> ---
>  coreutils/df.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/coreutils/df.c b/coreutils/df.c
> index 7a82fee..d79c11a 100644
> --- a/coreutils/df.c
> +++ b/coreutils/df.c
> @@ -85,12 +85,12 @@ int df_main(int argc UNUSED_PARAM, char **argv)
>         enum {
>                 OPT_KILO  = (1 << 0),
>                 OPT_POSIX = (1 << 1),
> -               OPT_ALL   = (1 << 2) * ENABLE_FEATURE_DF_FANCY,
> -               OPT_INODE = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
> -               OPT_BSIZE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
> -               OPT_HUMAN = (1 << (2 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
> -               OPT_MEGA  = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
> -               OPT_FSTYPE  = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)),
> +               OPT_FSTYPE  = (1 << 2),
> +               OPT_ALL   = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
> +               OPT_INODE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
> +               OPT_BSIZE = (1 << 5) * ENABLE_FEATURE_DF_FANCY,
> +               OPT_HUMAN = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
> +               OPT_MEGA  = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
>         };
>         const char *disp_units_hdr = NULL;
>         char *chp;
> @@ -102,10 +102,9 @@ int df_main(int argc UNUSED_PARAM, char **argv)
>  #elif ENABLE_FEATURE_HUMAN_READABLE
>         opt_complementary = "k-m:m-k";
>  #endif
> -       opt = getopt32(argv, "kP"
> +       opt = getopt32(argv, "kPT"
>                         IF_FEATURE_DF_FANCY("aiB:")
>                         IF_FEATURE_HUMAN_READABLE("hm")
> -                       "T"
>                         IF_FEATURE_DF_FANCY(, &chp));
>         if (opt & OPT_MEGA)
>                 df_disp_hr = 1024*1024;
> --
> 1.9.1

Applied, thanks!
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]