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

List:       busybox
Subject:    Re: [PATCH 03/19] wget: fix --passive-ftp option
From:       Denys Vlasenko <vda.linux () googlemail ! com>
Date:       2012-09-27 14:29:21
Message-ID: CAK1hOcNyfE4ZbHzmYB8CK_=VsQtiJYmcnhcXVzVxYJ=w9ceYfA () mail ! gmail ! com
[Download RAW message or body]

On Tue, Sep 25, 2012 at 2:06 PM, Florian Fainelli <florian@alphacore.org> wrote:
> From: Felix Fietkau <nbd@openwrt.org>
>
> Signed-off-by: Felix Fietkau <nbd@openwrt.org>
> ---
>  networking/wget.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/networking/wget.c b/networking/wget.c
> index 4eafebe..3281946 100644
> --- a/networking/wget.c
> +++ b/networking/wget.c
> @@ -920,7 +920,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
>                 /* Ignored: */
>                 // "tries\0"            Required_argument "t"
>                 /* Ignored (we always use PASV): */
> -               "passive-ftp\0"      No_argument       "\xff"
> +               "passive-ftp\0"      No_argument       "\xfd"
>                 "header\0"           Required_argument "\xfe"
>                 "post-data\0"        Required_argument "\xfd"
>                 /* Ignored (we don't do ssl) */

??

        getopt32(argv, "csqO:P:Y:U:T:" /*ignored:*/ "t:",
                &G.fname_out, &G.dir_prefix,
                &G.proxy_flag, &G.user_agent,
                IF_FEATURE_WGET_TIMEOUT(&G.timeout_seconds)
IF_NOT_FEATURE_WGET_TIMEOUT(NULL),
                NULL /* -t RETRIES */
                IF_FEATURE_WGET_LONG_OPTIONS(, &headers_llist)
                IF_FEATURE_WGET_LONG_OPTIONS(, &G.post_data)
        );
bb_error_msg("opt:%x", option_mask32);

So, -t is 9th opt, its bit is 0x100, and the next bit (0x200)
goes to the first long option w/o short one -> that is,
to --passive-ftp.
Testing:

$ ./busybox wget --passive-ftp qwe
wget: opt:200
wget: not an http or ftp url: qwe

I don't see any problem...
_______________________________________________
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]