FreeBSD patches

Xabier Oneca -- xOneca xoneca at gmail.com
Sun Jan 3 14:21:32 UTC 2021


Hi Alex,

On Sun, Jan 3, 2021 at 13:19, Denys Vlasenko (<vda.linux at googlemail.com>) wrote:
>
> Some parts looks a bit strange:
>
> diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
> index a60c33c35..db7d840fe 100644
> --- a/libbb/pw_encrypt.c
> +++ b/libbb/pw_encrypt.c
> @@ -7,8 +7,11 @@
>   * Licensed under GPLv2 or later, see file LICENSE in this source tree.
>   */
>  #if !ENABLE_USE_BB_CRYPT
> +#ifdef __FreeBSD__
> +#include <unistd.h>
> +#else
>  #include <crypt.h>
> -#endif
> +#endif#endif
>  #include "libbb.h"
>
> Why? <unistd.h> is already included via libbbb.h -> platform.h

Also further down:

> diff --git a/networking/httpd.c b/networking/httpd.c
> index 57e0ca493..ffd5635dc 100644
> --- a/networking/httpd.c
> +++ b/networking/httpd.c
> @@ -2225,6 +2225,13 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
>          remote_ip = ntohl(fromAddr->u.sin.sin_addr.s_addr);
>      }
>  # if ENABLE_FEATURE_IPV6
> +#ifdef __FreeBSD__
> +if (fromAddr->u.sa.sa_family == AF_INET6
> + && fromAddr->u.sin6.sin6_addr.s6_addr[0] == 0
> + && fromAddr->u.sin6.sin6_addr.s6_addr[1] == 0
> + && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[2]) == 0xffff)
> +    remote_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[3]);
> +#else
>      if (fromAddr->u.sa.sa_family == AF_INET6
>       && fromAddr->u.sin6.sin6_addr.s6_addr32[0] == 0
>       && fromAddr->u.sin6.sin6_addr.s6_addr32[1] == 0

There's no #endif added here. Seems like an incomplete #if?

> diff --git a/networking/traceroute.c b/networking/traceroute.c
> index b9e4aee24..cb88160d2 100644

HTH,

Xabier Oneca_,,_


More information about the busybox mailing list