mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Use Gnulib's version-etc-fsf' for --version' and `--help' output.

Browse source 
* m4/gnulib-cache.m4: Add `version-etc-fsf'.  Switch to LGPLv3+.

* GUILE-VERSION (PACKAGE): Change to "GNU Guile".

* Makefile.am (distdir): New variable.

* libguile/script.c (scm_shell_usage): Improve formatting.  Use
  `emit_bug_reporting_address ()'.
  (scm_compile_shell_switches): Use `version_etc ()'.
This commit is contained in:
Ludovic Courtès 2009-11-17 22:03:13 +01:00
parent 8bcecbd302
commit 4f02b98d0e
18 changed files with 899 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/vasnprintf.c
View file

@ -2375,16 +2375,16 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
characters = 0;
while (precision > 0)
{
char buf[64]; /* Assume MB_CUR_MAX <= 64. */
char cbuf[64]; /* Assume MB_CUR_MAX <= 64. */
int count;
if (*arg_end == 0)
/* Found the terminating null wide character. */
break;
# if HAVE_WCRTOMB
count = wcrtomb (buf, *arg_end, &state);
count = wcrtomb (cbuf, *arg_end, &state);
# else
count = wctomb (buf, *arg_end);
count = wctomb (cbuf, *arg_end);
# endif
if (count < 0)
{
@ -2420,16 +2420,16 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
characters = 0;
for (;;)
{
char buf[64]; /* Assume MB_CUR_MAX <= 64. */
char cbuf[64]; /* Assume MB_CUR_MAX <= 64. */
int count;
if (*arg_end == 0)
/* Found the terminating null wide character. */
break;
# if HAVE_WCRTOMB
count = wcrtomb (buf, *arg_end, &state);
count = wcrtomb (cbuf, *arg_end, &state);
# else
count = wctomb (buf, *arg_end);
count = wctomb (cbuf, *arg_end);
# endif
if (count < 0)
{
@ -2470,20 +2470,20 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
# endif
for (remaining = characters; remaining > 0; )
{
char buf[64]; /* Assume MB_CUR_MAX <= 64. */
char cbuf[64]; /* Assume MB_CUR_MAX <= 64. */
int count;
if (*arg == 0)
abort ();
# if HAVE_WCRTOMB
count = wcrtomb (buf, *arg, &state);
count = wcrtomb (cbuf, *arg, &state);
# else
count = wctomb (buf, *arg);
count = wctomb (cbuf, *arg);
# endif
if (count <= 0)
/* Inconsistency. */
abort ();
memcpy (tmpptr, buf, count);
memcpy (tmpptr, cbuf, count);
tmpptr += count;
arg++;
remaining -= count;
@ -2552,20 +2552,20 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
ENSURE_ALLOCATION (xsum (length, characters));
for (remaining = characters; remaining > 0; )
{
char buf[64]; /* Assume MB_CUR_MAX <= 64. */
char cbuf[64]; /* Assume MB_CUR_MAX <= 64. */
int count;
if (*arg == 0)
abort ();
# if HAVE_WCRTOMB
count = wcrtomb (buf, *arg, &state);
count = wcrtomb (cbuf, *arg, &state);
# else
count = wctomb (buf, *arg);
count = wctomb (cbuf, *arg);
# endif
if (count <= 0)
/* Inconsistency. */
abort ();
memcpy (result + length, buf, count);
memcpy (result + length, cbuf, count);
length += count;
arg++;
remaining -= count;
@ -2581,21 +2581,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
# endif
while (arg < arg_end)
{
char buf[64]; /* Assume MB_CUR_MAX <= 64. */
char cbuf[64]; /* Assume MB_CUR_MAX <= 64. */
int count;
if (*arg == 0)
abort ();
# if HAVE_WCRTOMB
count = wcrtomb (buf, *arg, &state);
count = wcrtomb (cbuf, *arg, &state);
# else
count = wctomb (buf, *arg);
count = wctomb (cbuf, *arg);
# endif
if (count <= 0)
/* Inconsistency. */
abort ();
ENSURE_ALLOCATION (xsum (length, count));
memcpy (result + length, buf, count);
memcpy (result + length, cbuf, count);
length += count;
arg++;
}