Paul Eggert <[EMAIL PROTECTED]> writes:
>> - getaddrinfo, inttostr: Paul, can you agree to put intprops under LGPL?
>
> I'd rather not. How about if we use something like the following
> patch instead?
I like it. Installed, thanks!
/Simon
> 2006-11-16 Paul Eggert <[EMAIL PROTECTED]>
>
> * modules/getaddinfo (Depends-on): Remove inttostr; add snprintf.
> * lib/getaddrinfo.c: Include snprintf.h rather than intprops.h
> and inttostr.h. Use snprintf rather than uinttostr, so that
> LGPLed code doesn't depend on GPLed.
>
> --- modules/getaddrinfo.~1.13.~ 2006-10-22 23:03:01.000000000 -0700
> +++ modules/getaddrinfo 2006-11-17 00:00:01.000000000 -0800
> @@ -10,7 +10,7 @@ m4/getaddrinfo.m4
> Depends-on:
> gettext-h
> inet_ntop
> -inttostr
> +snprintf
> socklen
> stdbool
> strdup
> --- lib/getaddrinfo.c.~1.19.~ 2006-10-29 13:52:55.000000000 -0800
> +++ lib/getaddrinfo.c 2006-11-16 23:57:21.000000000 -0800
> @@ -38,8 +38,7 @@
> #define N_(String) String
>
> #include "inet_ntop.h"
> -#include "intprops.h"
> -#include "inttostr.h"
> +#include "snprintf.h"
> #include "strdup.h"
>
> /* BeOS has AF_INET, but not PF_INET. */
> @@ -408,11 +407,8 @@ int getnameinfo(const struct sockaddr *r
> {
> unsigned short int port
> = ntohs (((const struct sockaddr_in *) sa)->sin_port);
> - char buf[INT_BUFSIZE_BOUND (port)];
> - char const *s = uinttostr (port, buf);
> - if (strlen (s) + 1 > servicelen)
> + if (servicelen <= snprintf (service, servicelen, "%u", port))
> return EAI_OVERFLOW;
> - memcpy (service, s, strlen (s) + 1);
> }
> break;
> }
