[Bug-gnulib] gettext vs. gnulib

[Karl Berry]

There were several files in gnulib/config/srclist.txt that were marked
to be resynced after the next gettext release.  Most now match, but a few
still have differences.  

- I guess we should not resync vasprintf.c.
- I'm not sure what to make of the vasprintf.h diff.
- The only differences in [un]setenv.c is ANSI stuff; if Bruno is
  eventually going to go ANSI for those, I'm inclined to prefer syncing
  to ANSIfication, but certainly won't insist.

Wdyt?


$ diff ../../gettext/gettext-runtime/libasprintf/vasprintf.c .
25a25,27
> #include <limits.h>
> #include <stdlib.h>
> 
34a37,44
>   if (length > INT_MAX)
>     {
>       /* We could produce such a big string, but can't return its length
>        as an 'int'.  */
>       free (result);
>       return -1;
>     }
> 

$ diff ../../gettext/gettext-runtime/libasprintf/vasprintf.h .
21a21,27
> #if HAVE_VASPRINTF
> 
> /* Get asprintf(), vasprintf() declarations.  */
> #include <stdio.h>
> 
> #else
> 
41a48,51
> /* Write formatted output to a string dynamically allocated with malloc().
>    If the memory allocation succeeds, store the address of the string in
>    *RESULT and return the number of resulting bytes, excluding the trailing
>    NUL.  Upon memory allocation error, or some other error, return -1.  */
50a61,62
> #endif

$ diff ../../gettext/gettext-tools/lib/setenv.c .
32,37c31,32
< #if _LIBC || HAVE_STDLIB_H
< # include <stdlib.h>
< #endif
< #if _LIBC || HAVE_STRING_H
< # include <string.h>
< #endif
---
> #include <stdlib.h>
> #include <string.h>
288c283
< clearenv ()
---
> clearenv (void)

$ diff ../../gettext/gettext-tools/lib/unsetenv.c .
31,36c30,31
< #if _LIBC || HAVE_STDLIB_H
< # include <stdlib.h>
< #endif
< #if _LIBC || HAVE_STRING_H
< # include <string.h>
< #endif
---
> #include <stdlib.h>
> #include <string.h>