Re: [PATCH] fix missing -F short-option for certfile [version 2]

[Wouter Verhelst <w@uter.be>]

Hi Matt,

This patch doesn't apply, possibly because your mail client mangled whitespace
or some such (but I'm not 100% sure).

Two ways out of this:

- Use "git send-email", which will automate sending the message for you;
- If you have the patch public somewhere, let me know where and I'll
  just pull.

Thanks.

On Mon, Jul 31, 2023 at 05:01:09PM -0400, Matt Panaro wrote:
> see previous thread: https://lists.debian.org/nbd/2023/07/msg00021.html
> for the motivation behind this refactor
> 
> in commit 1b8615, the `-F` short-option was accidentally refactored out of
> the codebase, so that only the long-option for `-certfile` would work.
> This commit restores the `-F` short-option, as well as conditionally
> populating the `short_opts` string based on compilation-options for
> `NETLINK` and `GNUTLS`
> ---
>  nbd-client.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/nbd-client.c b/nbd-client.c
> index dae4636..ac0419d 100644
> --- a/nbd-client.c
> +++ b/nbd-client.c
> @@ -896,11 +896,14 @@ void disconnect(char* device) {
>         close(nbd);
>  }
> 
> +static const char *short_opts = "-B:b:c:d:gH:hlnN:PpRSst:uVx"
>  #if HAVE_NETLINK
> -static const char *short_opts = "-A:B:b:c:C:d:gH:hK:LlnN:PpRSst:uVx";
> -#else
> -static const char *short_opts = "-A:B:b:c:C:d:gH:hK:lnN:PpRSst:uVx";
> +       "L"
> +#endif
> +#if HAVE_GNUTLS
> +       "A:C:F:K:"
>  #endif
> +       ;
> 
>  int main(int argc, char *argv[]) {
>         char* port=NBD_DEFAULT_PORT;

-- 
     w@uter.{be,co.za}
wouter@{grep.be,fosdem.org,debian.org}

I will have a Tin-Actinium-Potassium mixture, thanks.