lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
2001-08-19  Ulrich Drepper  <drepper@redhat.com>

	* sunrpc/svcauth_des.c (_svcauth_des): Avoid using bcopy.
	* sunrpc/xdr_rec.c: Likewise.
	* sunrpc/xdr_mem.c: Likewise.
	* sunrpc/svc_authux.c (_svcauth_unix): Likewise.
	* sunrpc/rpc_cmsg.c: Likewise.
	* sunrpc/getrpcport.c (getrpcport): Likewise.
	* sunrpc/clnt_simp.c (callrpc): Likewise.
	* sunrpc/clnt_gen.c (clnt_create): Likewise.
	* string/envz.c: Likewise.

	* po/ko.po: Update from translation team.

	* argp/argp-help.c: Handle wide oriented stderr stream.

	* conform/conformtest.pl: <inttypes.h> test requires <stddef.h>.
This commit is contained in:
Ulrich Drepper
2001-08-20 06:37:56 +00:00
parent 091b895531
commit 9af652f608
12 changed files with 950 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
argp/argp-help.c
View File

@ -1,5 +1,5 @@
/* Hierarchial argument parsing help output
Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
Copyright (C) 1995-2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
@ -52,6 +52,9 @@ char *alloca ();
#include <stdarg.h>
#include <malloc.h>
#include <ctype.h>
#ifdef USE_IN_LIBIO
# include <wchar.h>
#endif
#ifndef _
/* This is for other GNU distributions with internationalized messages. */
@ -1702,19 +1705,39 @@ __argp_error (const struct argp_state *state, const char *fmt, ...)
__flockfile (stream);
fputs_unlocked (state ? state->name : program_invocation_short_name,
stream);
putc_unlocked (':', stream);
putc_unlocked (' ', stream);
va_start (ap, fmt);
vfprintf (stream, fmt, ap);
va_end (ap);
putc_unlocked ('\n', stream);
#ifdef USE_IN_LIBIO
if (_IO_fwide (stream, 0) > 0)
{
char *buf;
asprintf (&buf, fmt, ap);
fwprintf (stream, L"%s: %s\n",
state ? state->name : program_invocation_short_name,
buf);
free (buf);
}
else
#endif
{
fputs_unlocked (state
? state->name : program_invocation_short_name,
stream);
putc_unlocked (':', stream);
putc_unlocked (' ', stream);
vfprintf (stream, fmt, ap);
putc_unlocked ('\n', stream);
}
__argp_state_help (state, stream, ARGP_HELP_STD_ERR);
va_end (ap);
__funlockfile (stream);
}
}
@ -1743,29 +1766,68 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
{
__flockfile (stream);
fputs_unlocked (state ? state->name : program_invocation_short_name,
stream);
#ifdef USE_IN_LIBIO
if (_IO_fwide (stream, 0) > 0)
fputws_unlocked (state
? state->name : program_invocation_short_name,
stream);
else
#endif
fputs_unlocked (state
? state->name : program_invocation_short_name,
stream);
if (fmt)
{
va_list ap;
putc_unlocked (':', stream);
putc_unlocked (' ', stream);
va_start (ap, fmt);
vfprintf (stream, fmt, ap);
#ifdef USE_IN_LIBIO
if (_IO_fwide (stream, 0) > 0)
{
char *buf;
asprintf (&buf, fmt, ap);
fwprintf (stream, L": %s", buf);
free (buf);
}
else
#endif
{
putc_unlocked (':', stream);
putc_unlocked (' ', stream);
vfprintf (stream, fmt, ap);
}
va_end (ap);
}
if (errnum)
{
putc_unlocked (':', stream);
putc_unlocked (' ', stream);
fputs (strerror (errnum), stream);
char buf[200];
#ifdef USE_IN_LIBIO
if (_IO_fwide (stream, 0) > 0)
fwprintf (stream, ": %s",
__strerror_r (errnum, buf, sizeof (buf)));
else
#endif
{
putc_unlocked (':', stream);
putc_unlocked (' ', stream);
fputs (__strerror_r (errnum, buf, sizeof (buf)), stream);
}
}
putc_unlocked ('\n', stream);
#ifdef USE_IN_LIBIO
if (_IO_fwide (stream, 0) > 0)
putwc_unlocked (L'\n', stream);
else
#endif
putc_unlocked ('\n', stream);
__funlockfile (stream);