AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-14 17:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated to fedora-glibc-20050729T1531

Browse Source
This commit is contained in:
Jakub Jelinek 2005-07-29 15:59:52 +00:00
parent 6220c7e391
commit 1ce6c1300b
16 changed files with 6188 additions and 5487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ChangeLog
View File

@ -1,6 +1,46 @@
2005-07-28 Thomas Schwinge <schwinge@nic-nac-project.de>
* misc/error.c [_LIBC]: Include <stdbool.h> and <stdint.h>.
2005-07-28 Ulrich Drepper <drepper@redhat.com>
* nis/nis_xdr.c: Help gcc to generate unnecessary wrapper functions.
2005-07-28 Jakub Jelinek <jakub@redhat.com>
* stdio-common/fxprintf.c (__fxprintf): Add INTUSE to _IO_vfprintf
call.
* gmon/gmon.c (write_gmon): Use __snprintf rather than snprintf.
2005-07-28 Ulrich Drepper <drepper@redhat.com>
* nis/nis_file.c: Rewrite the two pairs of functions into wrappers
around a pair of new, generalized functions. 22% size reduction.
2005-07-27 Ulrich Drepper <drepper@redhat.com>
* nis/nis_xdr.c: Remove unnecessary cast which might hide bugs.
Rearrange code. This reduces the code size 10%.
2005-07-26 Jakub Jelinek <jakub@redhat.com>
* misc/error.c (error_tail): Fix a comment typo.
2005-07-25 Ulrich Drepper <drepper@redhat.com>
* po/zh_TW.po: Update from translation team.
* debug/mbstowcs_chk.c: New file.
* debug/wcstombs_chk.c: New file.
* debug/Makefile (routines): Add mbstowcs_chk and wcstombs_chk.
* debug/Versions: Add __mbstowcs_chk and __wcstombs_chk.
* stdlib/bits/stdlib.h: Add definitions for mbstowcs and wcstombs.
* wcsmbs/bits/wchar2.h (mbsrtowcs): Pretty printing.
2005-07-24 Ulrich Drepper <drepper@redhat.com>
* string/test-memset.c (test_main): Use negative byte value is
* string/test-memset.c (test_main): Use negative byte value in
test.
* string/test-memset.c (do_one_test): Compare effect of call, not

3
debug/Makefile
View File

@ -39,7 +39,8 @@ routines = backtrace backtracesyms backtracesymsfd noophooks \
vwprintf_chk vfwprintf_chk fgetws_chk fgetws_u_chk \
confstr_chk getgroups_chk ttyname_r_chk getlogin_r_chk \
gethostname_chk getdomainname_chk wcrtomb_chk mbsnrtowcs_chk \
wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk \
wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk mbstowcs_chk \
wcstombs_chk \
stack_chk_fail \
$(static-only-routines)
static-only-routines := warning-nop stack_chk_fail_local

3
debug/Versions
View File

@ -31,7 +31,8 @@ libc {
__vwprintf_chk; __vfwprintf_chk; __fgetws_chk; __fgetws_unlocked_chk;
__confstr_chk; __getgroups_chk; __ttyname_r_chk; __getlogin_r_chk;
__gethostname_chk; __getdomainname_chk; __wcrtomb_chk; __mbsnrtowcs_chk;
__wcsnrtombs_chk; __mbsrtowcs_chk; __wcsrtombs_chk;
__wcsnrtombs_chk; __mbsrtowcs_chk; __wcsrtombs_chk; __mbstowcs_chk;
__wcstombs_chk;
__stack_chk_fail;
}

35
debug/mbstowcs_chk.c Normal file
View File

@ -0,0 +1,35 @@
/* Copyright (C) 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <locale.h>
#include <string.h>
#include <wchar.h>
size_t
__mbstowcs_chk (wchar_t *dst, const char **src, size_t len, size_t dstlen)
{
if (__builtin_expect (dstlen < len * sizeof (wchar_t), 0))
__chk_fail ();
mbstate_t state;
memset (&state, '\0', sizeof state);
/* Return how many we wrote (or maybe an error). */
return __mbsrtowcs (dst, src, len, &state);
}

36
debug/wcstombs_chk.c Normal file
View File

@ -0,0 +1,36 @@
/* Copyright (C) 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <locale.h>
#include <string.h>
#include <wchar.h>
size_t
__wcstombs_chk (char *dst, __const wchar_t *src, size_t len, size_t dstlen)
{
if (__builtin_expect (dstlen < len, 0))
__chk_fail ();
mbstate_t state;
memset (&state, '\0', sizeof state);
/* Return how many we wrote (or maybe an error). */
return __wcsrtombs (dst, src, len, &state);
}

4
fedora/branch.mk
View File

@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-fc4
fedora-sync-date := 2005-07-25 06:27 UTC
fedora-sync-tag := fedora-glibc-20050725T0627
fedora-sync-date := 2005-07-29 15:31 UTC
fedora-sync-tag := fedora-glibc-20050729T1531

2
gmon/gmon.c
View File

@ -331,7 +331,7 @@ write_gmon (void)
{
size_t len = strlen (env);
char buf[len + 20];
snprintf (buf, sizeof (buf), "%s.%u", env, __getpid ());
__snprintf (buf, sizeof (buf), "%s.%u", env, __getpid ());
fd = open_not_cancel (buf, O_CREAT|O_TRUNC|O_WRONLY|O_NOFOLLOW, 0666);
}

5
localedata/ChangeLog
View File

@ -1,3 +1,8 @@
2005-07-26 Ulrich Drepper <drepper@redhat.com>
* locales/hu_HU: Better collation.
Patch by Gyuro Lehel <lehel@freemail.hu>.
2005-07-08 Ulrich Drepper <drepper@redhat.com>
[BZ #408]

49
localedata/locales/hu_HU
View File

@ -67,8 +67,15 @@ copy "iso14651_t1"
%% a' e' i' o' u' are sorted as if they were unaccented
%% o" and u" are sorted as if they were o: and u:
collating-symbol <aacute>
collating-symbol <eacute>
collating-symbol <iacute>
collating-symbol <oacute>
collating-symbol <odouble>
collating-symbol <odacute>
collating-symbol <uacute>
collating-symbol <udouble>
collating-symbol <udacute>
collating-symbol <cs>
collating-element <C-S> from "<U0043><U0053>"
@ -233,39 +240,65 @@ reorder-after <CAP>
<CAP-CAP-MIN>
<CAP-CAP-CAP>
reorder-after <a>
<aacute>
reorder-after <c>
<cs>
reorder-after <d>
<dz>
<dzs>
reorder-after <e>
<eacute>
reorder-after <g>
<gy>
reorder-after <i>
<iacute>
reorder-after <l>
<ly>
reorder-after <n>
<ny>
reorder-after <o>
<oacute>
<odouble>
<odacute>
reorder-after <s>
<sz>
reorder-after <t>
<ty>
reorder-after <u>
<uacute>
<udouble>
<udacute>
reorder-after <z>
<zs>
reorder-after <a>
<U00E1> <aacute>;<aacute>;<MIN>;IGNORE
<U00C1> <aacute>;<aacute>;<CAP>;IGNORE
reorder-after <e>
<U00E9> <eacute>;<eacute>;<MIN>;IGNORE
<U00C9> <eacute>;<eacute>;<CAP>;IGNORE
reorder-after <i>
<U00ED> <iacute>;<iacute>;<MIN>;IGNORE
<U00CD> <iacute>;<iacute>;<CAP>;IGNORE
reorder-after <o>
<U00F6> <odouble>;<REU>;<MIN>;IGNORE
<U0151> <odouble>;<DAC>;<MIN>;IGNORE
<U00D6> <odouble>;<REU>;<CAP>;IGNORE
<U0150> <odouble>;<DAC>;<CAP>;IGNORE
<U00D3> <oacute>;<oacute>;<MIN>;IGNORE
<U00F6> <odouble>;<odouble>;<MIN>;IGNORE
<U0151> <odacute>;<odacute>;<MIN>;IGNORE
<U00F3> <oacute>;<oacute>;<CAP>;IGNORE
<U00D6> <odouble>;<odouble>;<CAP>;IGNORE
<U0150> <odacute>;<odacute>;<CAP>;IGNORE
reorder-after <u>
<U00FC> <udouble>;<REU>;<MIN>;IGNORE
<U0171> <udouble>;<DAC>;<MIN>;IGNORE
<U00DC> <udouble>;<REU>;<CAP>;IGNORE
<U0170> <udouble>;<DAC>;<CAP>;IGNORE
<U00FA> <uacute>;<uacute>;<MIN>;IGNORE
<U00FC> <udouble>;<udouble>;<MIN>;IGNORE
<U0171> <udacute>;<udacute>;<MIN>;IGNORE
<U00DA> <uacute>;<uacute>;<CAP>;IGNORE
<U00DC> <udouble>;<udouble>;<CAP>;IGNORE
<U0170> <udacute>;<udacute>;<CAP>;IGNORE
reorder-after <U0043>
<C-S> <cs>;<BAS>;<CAP>;IGNORE

4
misc/error.c
View File

@ -26,6 +26,8 @@
#include <stdio.h>
#include <libintl.h>
#ifdef _LIBC
# include <stdbool.h>
# include <stdint.h>
# include <wchar.h>
# define mbsrtowcs __mbsrtowcs
#endif
@ -210,7 +212,7 @@ error_tail (int status, int errnum, const char *message, va_list args)
if (__builtin_expect (len >= SIZE_MAX / 2, 0))
{
/* This reallyy should not happen if everything is fine. */
/* This really should not happen if everything is fine. */
res = (size_t) -1;
break;
}

105
nis/nis_file.c
View File

@ -1,4 +1,4 @@
/* Copyright (c) 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
/* Copyright (c) 1997, 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
@ -23,27 +23,30 @@
#include <rpcsvc/nis.h>
#include "nis_xdr.h"
static const char cold_start_file[] = "/var/nis/NIS_COLD_START";
typedef bool_t (*iofct_t) (XDR *, void *);
typedef void (*freefct_t) (void *);
directory_obj *
readColdStartFile (void)
static void *
read_nis_obj (const char *name, iofct_t readfct, freefct_t freefct,
size_t objsize)
{
FILE *in = fopen (cold_start_file, "rc");
FILE *in = fopen (name, "rc");
if (in == NULL)
return NULL;
directory_obj *obj = calloc (1, sizeof (directory_obj));
void *obj = calloc (1, objsize);
if (obj != NULL)
{
XDR xdrs;
xdrstdio_create (&xdrs, in, XDR_DECODE);
bool_t status = _xdr_directory_obj (&xdrs, obj);
bool_t status = readfct (&xdrs, obj);
xdr_destroy (&xdrs);
if (!status)
{
nis_free_directory (obj);
freefct (obj);
obj = NULL;
}
}
@ -52,75 +55,49 @@ readColdStartFile (void)
return obj;
}
static bool_t
write_nis_obj (const char *name, const void *obj, iofct_t writefct)
{
FILE *out = fopen (name, "w");
if (out == NULL)
return FALSE;
XDR xdrs;
xdrstdio_create (&xdrs, out, XDR_ENCODE);
bool_t status = writefct (&xdrs, (void *) obj);
xdr_destroy (&xdrs);
fclose (out);
return status;
}
static const char cold_start_file[] = "/var/nis/NIS_COLD_START";
directory_obj *
readColdStartFile (void)
{
return read_nis_obj (cold_start_file, (iofct_t) _xdr_directory_obj,
(freefct_t) nis_free_directory, sizeof (directory_obj));
}
libnsl_hidden_def (readColdStartFile)
bool_t
writeColdStartFile (const directory_obj *obj)
{
XDR xdrs;
FILE *out;
bool_t status;
out = fopen (cold_start_file, "wb");
if (out == NULL)
return FALSE;
xdrstdio_create (&xdrs, out, XDR_ENCODE);
status = _xdr_directory_obj (&xdrs, (directory_obj *) obj);
xdr_destroy (&xdrs);
fclose (out);
return status;
return write_nis_obj (cold_start_file, obj, (iofct_t) _xdr_directory_obj);
}
nis_object *
nis_read_obj (const char *name)
{
XDR xdrs;
FILE *in;
bool_t status;
nis_object *obj;
in = fopen (name, "rb");
if (in == NULL)
return NULL;
obj = calloc (1, sizeof (nis_object));
if (obj == NULL)
{
fclose (in);
return NULL;
}
xdrstdio_create (&xdrs, in, XDR_DECODE);
status =_xdr_nis_object (&xdrs, obj);
xdr_destroy (&xdrs);
fclose (in);
if (status)
return obj;
else
{
nis_free_object (obj);
return NULL;
}
return read_nis_obj (name, (iofct_t) _xdr_nis_object,
(freefct_t) nis_free_object, sizeof (nis_object));
}
bool_t
nis_write_obj (const char *name, const nis_object *obj)
{
XDR xdrs;
FILE *out;
bool_t status;
out = fopen (name, "wb");
if (out == NULL)
return FALSE;
xdrstdio_create (&xdrs, out, XDR_ENCODE);
status = _xdr_nis_object (&xdrs, (nis_object *) obj);
xdr_destroy (&xdrs);
fclose (out);
return status;
return write_nis_obj (name, obj, (iofct_t) _xdr_nis_object);
}

508
nis/nis_xdr.c
View File

@ -1,4 +1,4 @@
/* Copyright (c) 1997, 1998 Free Software Foundation, Inc.
/* Copyright (c) 1997, 1998, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
@ -28,383 +28,401 @@
static bool_t
xdr_nis_attr (XDR *xdrs, nis_attr *objp)
{
if (!xdr_string (xdrs, &objp->zattr_ndx, ~0))
return FALSE;
if (!xdr_bytes (xdrs, (char **) &objp->zattr_val.zattr_val_val,
(u_int *) & objp->zattr_val.zattr_val_len, ~0))
return FALSE;
return TRUE;
bool_t res = xdr_string (xdrs, &objp->zattr_ndx, ~0);
if (__builtin_expect (res, TRUE))
res = xdr_bytes (xdrs, (char **) &objp->zattr_val.zattr_val_val,
&objp->zattr_val.zattr_val_len, ~0);
return res;
}
bool_t
_xdr_nis_name (XDR *xdrs, nis_name *objp)
{
if (!xdr_string (xdrs, objp, ~0))
return FALSE;
return TRUE;
return xdr_string (xdrs, objp, ~0);
}
static bool_t
static __always_inline bool_t
xdr_zotypes (XDR *xdrs, zotypes *objp)
{
if (!xdr_enum (xdrs, (enum_t *) objp))
return FALSE;
return TRUE;
return xdr_enum (xdrs, (enum_t *) objp);
}
static bool_t
static __always_inline bool_t
xdr_nstype (XDR *xdrs, nstype *objp)
{
if (!xdr_enum (xdrs, (enum_t *) objp))
return FALSE;
return TRUE;
return xdr_enum (xdrs, (enum_t *) objp);
}
static bool_t
xdr_oar_mask (XDR *xdrs, oar_mask *objp)
{
if (!xdr_u_int (xdrs, &objp->oa_rights))
return FALSE;
if (!xdr_zotypes (xdrs, &objp->oa_otype))
return FALSE;
return TRUE;
bool_t res = xdr_u_int (xdrs, &objp->oa_rights);
if (__builtin_expect (res, TRUE))
res = xdr_zotypes (xdrs, &objp->oa_otype);
return res;
}
static bool_t
xdr_endpoint (XDR *xdrs, endpoint *objp)
{
if (!xdr_string (xdrs, &objp->uaddr, ~0))
return FALSE;
if (!xdr_string (xdrs, &objp->family, ~0))
return FALSE;
if (!xdr_string (xdrs, &objp->proto, ~0))
return FALSE;
return TRUE;
bool_t res = xdr_string (xdrs, &objp->uaddr, ~0);
if (__builtin_expect (res, TRUE))
{
res = xdr_string (xdrs, &objp->family, ~0);
if (__builtin_expect (res, 1))
res = xdr_string (xdrs, &objp->proto, ~0);
}
return res;
}
bool_t
_xdr_nis_server (XDR *xdrs, nis_server *objp)
{
if (!_xdr_nis_name (xdrs, &objp->name))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->ep.ep_val, (u_int *) &objp->ep.ep_len,
~0, sizeof (endpoint), (xdrproc_t) xdr_endpoint))
return FALSE;
if (!xdr_u_int (xdrs, &objp->key_type))
return FALSE;
if (!xdr_netobj (xdrs, &objp->pkey))
return FALSE;
return TRUE;
bool_t res = _xdr_nis_name (xdrs, &objp->name);
if (__builtin_expect (res, TRUE))
{
res = xdr_array (xdrs, (char **) &objp->ep.ep_val, &objp->ep.ep_len,
~0, sizeof (endpoint), (xdrproc_t) xdr_endpoint);
if (__builtin_expect (res, TRUE))
{
res = xdr_u_int (xdrs, &objp->key_type);
if (__builtin_expect (res, TRUE))
res = xdr_netobj (xdrs, &objp->pkey);
}
}
return res;
}
bool_t
_xdr_directory_obj (XDR *xdrs, directory_obj *objp)
{
if (!_xdr_nis_name (xdrs, &objp->do_name))
return FALSE;
if (!xdr_nstype (xdrs, &objp->do_type))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->do_servers.do_servers_val,
(u_int *) & objp->do_servers.do_servers_len, ~0,
sizeof (nis_server), (xdrproc_t) _xdr_nis_server))
return FALSE;
if (!xdr_uint32_t (xdrs, &objp->do_ttl))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->do_armask.do_armask_val,
(u_int *) & objp->do_armask.do_armask_len, ~0,
sizeof (oar_mask), (xdrproc_t) xdr_oar_mask))
return FALSE;
return TRUE;
bool_t res = _xdr_nis_name (xdrs, &objp->do_name);
if (__builtin_expect (res, TRUE))
{
res = xdr_nstype (xdrs, &objp->do_type);
if (__builtin_expect (res, TRUE))
{
res = xdr_array (xdrs, (char **) &objp->do_servers.do_servers_val,
&objp->do_servers.do_servers_len, ~0,
sizeof (nis_server), (xdrproc_t) _xdr_nis_server);
if (__builtin_expect (res, TRUE))
{
res = xdr_uint32_t (xdrs, &objp->do_ttl);
if (__builtin_expect (res, TRUE))
res = xdr_array (xdrs,
(char **) &objp->do_armask.do_armask_val,
&objp->do_armask.do_armask_len, ~0,
sizeof (oar_mask), (xdrproc_t) xdr_oar_mask);
}
}
}
return res;
}
static bool_t
xdr_entry_col (XDR *xdrs, entry_col *objp)
{
if (!xdr_u_int (xdrs, &objp->ec_flags))
return FALSE;
if (!xdr_bytes (xdrs, (char **) &objp->ec_value.ec_value_val,
(u_int *) &objp->ec_value.ec_value_len, ~0))
return FALSE;
return TRUE;
bool_t res = xdr_u_int (xdrs, &objp->ec_flags);
if (__builtin_expect (res, TRUE))
res = xdr_bytes (xdrs, (char **) &objp->ec_value.ec_value_val,
&objp->ec_value.ec_value_len, ~0);
return res;
}
static bool_t
xdr_entry_obj (XDR *xdrs, entry_obj *objp)
{
if (!xdr_string (xdrs, &objp->en_type, ~0))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->en_cols.en_cols_val,
(u_int *) &objp->en_cols.en_cols_len, ~0,
sizeof (entry_col), (xdrproc_t) xdr_entry_col))
return FALSE;
return TRUE;
bool_t res = xdr_string (xdrs, &objp->en_type, ~0);
if (__builtin_expect (res, TRUE))
res = xdr_array (xdrs, (char **) &objp->en_cols.en_cols_val,
&objp->en_cols.en_cols_len, ~0,
sizeof (entry_col), (xdrproc_t) xdr_entry_col);
return res;
}
static bool_t
xdr_group_obj (XDR *xdrs, group_obj *objp)
{
if (!xdr_u_int (xdrs, &objp->gr_flags))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->gr_members.gr_members_val,
(u_int *) &objp->gr_members.gr_members_len, ~0,
sizeof (nis_name), (xdrproc_t) _xdr_nis_name))
return FALSE;
return TRUE;
bool_t res = xdr_u_int (xdrs, &objp->gr_flags);
if (__builtin_expect (res, TRUE))
res = xdr_array (xdrs, (char **) &objp->gr_members.gr_members_val,
&objp->gr_members.gr_members_len, ~0,
sizeof (nis_name), (xdrproc_t) _xdr_nis_name);
return res;
}
static bool_t
xdr_link_obj (XDR *xdrs, link_obj *objp)
{
if (!xdr_zotypes (xdrs, &objp->li_rtype))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->li_attrs.li_attrs_val,
(u_int *) &objp->li_attrs.li_attrs_len, ~0,
sizeof (nis_attr), (xdrproc_t) xdr_nis_attr))
return FALSE;
if (!_xdr_nis_name (xdrs, &objp->li_name))
return FALSE;
return TRUE;
bool_t res = xdr_zotypes (xdrs, &objp->li_rtype);
if (__builtin_expect (res, TRUE))
{
res = xdr_array (xdrs, (char **) &objp->li_attrs.li_attrs_val,
&objp->li_attrs.li_attrs_len, ~0,
sizeof (nis_attr), (xdrproc_t) xdr_nis_attr);
if (__builtin_expect (res, TRUE))
res = _xdr_nis_name (xdrs, &objp->li_name);
}
return res;
}
static bool_t
xdr_table_col (XDR *xdrs, table_col *objp)
{
if (!xdr_string (xdrs, &objp->tc_name, 64))
return FALSE;
if (!xdr_u_int (xdrs, &objp->tc_flags))
return FALSE;
if (!xdr_u_int (xdrs, &objp->tc_rights))
return FALSE;
return TRUE;
bool_t res = xdr_string (xdrs, &objp->tc_name, 64);
if (__builtin_expect (res, TRUE))
{
res = xdr_u_int (xdrs, &objp->tc_flags);
if (__builtin_expect (res, TRUE))
res = xdr_u_int (xdrs, &objp->tc_rights);
}
return res;
}
static bool_t
xdr_table_obj (XDR *xdrs, table_obj *objp)
{
if (!xdr_string (xdrs, &objp->ta_type, 64))
return FALSE;
if (!xdr_int (xdrs, &objp->ta_maxcol))
return FALSE;
if (!xdr_u_char (xdrs, &objp->ta_sep))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->ta_cols.ta_cols_val,
(u_int *) &objp->ta_cols.ta_cols_len, ~0,
sizeof (table_col), (xdrproc_t) xdr_table_col))
return FALSE;
if (!xdr_string (xdrs, &objp->ta_path, ~0))
return FALSE;
return TRUE;
bool_t res = xdr_string (xdrs, &objp->ta_type, 64);
if (__builtin_expect (res, TRUE))
{
res = xdr_int (xdrs, &objp->ta_maxcol);
if (__builtin_expect (res, TRUE))
{
res = xdr_u_char (xdrs, &objp->ta_sep);
if (__builtin_expect (res, TRUE))
{
res = xdr_array (xdrs, (char **) &objp->ta_cols.ta_cols_val,
&objp->ta_cols.ta_cols_len, ~0,
sizeof (table_col), (xdrproc_t) xdr_table_col);
if (__builtin_expect (res, TRUE))
res = xdr_string (xdrs, &objp->ta_path, ~0);
}
}
}
return res;
}
static bool_t
xdr_objdata (XDR *xdrs, objdata *objp)
{
if (!xdr_zotypes (xdrs, &objp->zo_type))
return FALSE;
bool_t res = xdr_zotypes (xdrs, &objp->zo_type);
if (!__builtin_expect (res, TRUE))
return res;
switch (objp->zo_type)
{
case NIS_DIRECTORY_OBJ:
if (!_xdr_directory_obj (xdrs, &objp->objdata_u.di_data))
return FALSE;
break;
return _xdr_directory_obj (xdrs, &objp->objdata_u.di_data);
case NIS_GROUP_OBJ:
if (!xdr_group_obj (xdrs, &objp->objdata_u.gr_data))
return FALSE;
break;
return xdr_group_obj (xdrs, &objp->objdata_u.gr_data);
case NIS_TABLE_OBJ:
if (!xdr_table_obj (xdrs, &objp->objdata_u.ta_data))
return FALSE;
break;
return xdr_table_obj (xdrs, &objp->objdata_u.ta_data);
case NIS_ENTRY_OBJ:
if (!xdr_entry_obj (xdrs, &objp->objdata_u.en_data))
return FALSE;
break;
return xdr_entry_obj (xdrs, &objp->objdata_u.en_data);
case NIS_LINK_OBJ:
if (!xdr_link_obj (xdrs, &objp->objdata_u.li_data))
return FALSE;
break;
return xdr_link_obj (xdrs, &objp->objdata_u.li_data);
case NIS_PRIVATE_OBJ:
if (!xdr_bytes (xdrs, (char **) &objp->objdata_u.po_data.po_data_val,
(u_int *) & objp->objdata_u.po_data.po_data_len, ~0))
return FALSE;
break;
return xdr_bytes (xdrs, &objp->objdata_u.po_data.po_data_val,
&objp->objdata_u.po_data.po_data_len, ~0);
case NIS_NO_OBJ:
break;
case NIS_BOGUS_OBJ:
break;
default:
break;
return TRUE;
}
return TRUE;
}
static bool_t
xdr_nis_oid (XDR *xdrs, nis_oid *objp)
{
if (!xdr_uint32_t (xdrs, &objp->ctime))
return FALSE;
if (!xdr_uint32_t (xdrs, &objp->mtime))
return FALSE;
return TRUE;
bool_t res = xdr_uint32_t (xdrs, &objp->ctime);
if (__builtin_expect (res, TRUE))
res = xdr_uint32_t (xdrs, &objp->mtime);
return res;
}
bool_t
_xdr_nis_object (XDR *xdrs, nis_object *objp)
{
if (!xdr_nis_oid (xdrs, &objp->zo_oid))
return FALSE;
if (!_xdr_nis_name (xdrs, &objp->zo_name))
return FALSE;
if (!_xdr_nis_name (xdrs, &objp->zo_owner))
return FALSE;
if (!_xdr_nis_name (xdrs, &objp->zo_group))
return FALSE;
if (!_xdr_nis_name (xdrs, &objp->zo_domain))
return FALSE;
if (!xdr_u_int (xdrs, &objp->zo_access))
return FALSE;
if (!xdr_uint32_t (xdrs, &objp->zo_ttl))
return FALSE;
if (!xdr_objdata (xdrs, &objp->zo_data))
return FALSE;
return TRUE;
bool_t res = xdr_nis_oid (xdrs, &objp->zo_oid);
if (__builtin_expect (res, TRUE))
{
res = _xdr_nis_name (xdrs, &objp->zo_name);
if (__builtin_expect (res, TRUE))
{
res = _xdr_nis_name (xdrs, &objp->zo_owner);
if (__builtin_expect (res, TRUE))
{
res = _xdr_nis_name (xdrs, &objp->zo_group);
if (__builtin_expect (res, TRUE))
{
res = _xdr_nis_name (xdrs, &objp->zo_domain);
if (__builtin_expect (res, TRUE))
{
res = xdr_u_int (xdrs, &objp->zo_access);
if (__builtin_expect (res, TRUE))
{
res = xdr_uint32_t (xdrs, &objp->zo_ttl);
if (__builtin_expect (res, TRUE))
res = xdr_objdata (xdrs, &objp->zo_data);
}
}
}
}
}
}
return res;
}
bool_t
_xdr_nis_error (XDR *xdrs, nis_error *objp)
{
if (!xdr_enum (xdrs, (enum_t *) objp))
return FALSE;
return TRUE;
return xdr_enum (xdrs, (enum_t *) objp);
}
bool_t
_xdr_nis_result (XDR *xdrs, nis_result *objp)
{
if (!_xdr_nis_error (xdrs, &objp->status))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->objects.objects_val,
(u_int *) &objp->objects.objects_len, ~0,
sizeof (nis_object), (xdrproc_t) _xdr_nis_object))
return FALSE;
if (!xdr_netobj (xdrs, &objp->cookie))
return FALSE;
if (!xdr_uint32_t (xdrs, &objp->zticks))
return FALSE;
if (!xdr_uint32_t (xdrs, &objp->dticks))
return FALSE;
if (!xdr_uint32_t (xdrs, &objp->aticks))
return FALSE;
if (!xdr_uint32_t (xdrs, &objp->cticks))
return FALSE;
return TRUE;
bool res = _xdr_nis_error (xdrs, &objp->status);
if (__builtin_expect (res, TRUE))
{
res = xdr_array (xdrs, (char **) &objp->objects.objects_val,
&objp->objects.objects_len, ~0,
sizeof (nis_object), (xdrproc_t) _xdr_nis_object);
if (__builtin_expect (res, TRUE))
{
res = xdr_netobj (xdrs, &objp->cookie);
if (__builtin_expect (res, TRUE))
{
res = xdr_uint32_t (xdrs, &objp->zticks);
if (__builtin_expect (res, TRUE))
{
res = xdr_uint32_t (xdrs, &objp->dticks);
if (__builtin_expect (res, TRUE))
{
res = xdr_uint32_t (xdrs, &objp->aticks);
if (__builtin_expect (res, TRUE))
res = xdr_uint32_t (xdrs, &objp->cticks);
}
}
}
}
}
return res;
}
bool_t
_xdr_ns_request (XDR *xdrs, ns_request *objp)
{
if (!_xdr_nis_name (xdrs, &objp->ns_name))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->ns_object.ns_object_val,
(u_int *) &objp->ns_object.ns_object_len, 1,
sizeof (nis_object), (xdrproc_t) _xdr_nis_object))
return FALSE;
return TRUE;
bool_t res = _xdr_nis_name (xdrs, &objp->ns_name);
if (__builtin_expect (res, TRUE))
res = xdr_array (xdrs, (char **) &objp->ns_object.ns_object_val,
&objp->ns_object.ns_object_len, 1,
sizeof (nis_object), (xdrproc_t) _xdr_nis_object);
return res;
}
bool_t
_xdr_ib_request (XDR *xdrs, ib_request *objp)
{
if (!_xdr_nis_name (xdrs, &objp->ibr_name))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->ibr_srch.ibr_srch_val,
(u_int *) &objp->ibr_srch.ibr_srch_len, ~0,
sizeof (nis_attr), (xdrproc_t) xdr_nis_attr))
return FALSE;
if (!xdr_u_int (xdrs, &objp->ibr_flags))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->ibr_obj.ibr_obj_val,
(u_int *) &objp->ibr_obj.ibr_obj_len, 1,
sizeof (nis_object), (xdrproc_t) _xdr_nis_object))
return FALSE;
if (!xdr_array (xdrs, (char **) &objp->ibr_cbhost.ibr_cbhost_val,
(u_int *) &objp->ibr_cbhost.ibr_cbhost_len, 1,
sizeof (nis_server), (xdrproc_t) _xdr_nis_server))
return FALSE;
if (!xdr_u_int (xdrs, &objp->ibr_bufsize))
return FALSE;
if (!xdr_netobj (xdrs, &objp->ibr_cookie))
return FALSE;
return TRUE;
bool_t res = _xdr_nis_name (xdrs, &objp->ibr_name);
if (__builtin_expect (res, TRUE))
{
res = xdr_array (xdrs, (char **) &objp->ibr_srch.ibr_srch_val,
&objp->ibr_srch.ibr_srch_len, ~0,
sizeof (nis_attr), (xdrproc_t) xdr_nis_attr);
if (__builtin_expect (res, TRUE))
{
res = xdr_u_int (xdrs, &objp->ibr_flags);
if (__builtin_expect (res, TRUE))
{
res = xdr_array (xdrs, (char **) &objp->ibr_obj.ibr_obj_val,
&objp->ibr_obj.ibr_obj_len, 1,
sizeof (nis_object),
(xdrproc_t) _xdr_nis_object);
if (__builtin_expect (res, TRUE))
{
res = xdr_array (xdrs,
(char **) &objp->ibr_cbhost.ibr_cbhost_val,
&objp->ibr_cbhost.ibr_cbhost_len, 1,
sizeof (nis_server),
(xdrproc_t) _xdr_nis_server);
if (__builtin_expect (res, TRUE))
{
res = xdr_u_int (xdrs, &objp->ibr_bufsize);
if (__builtin_expect (res, TRUE))
res = xdr_netobj (xdrs, &objp->ibr_cookie);
}
}
}
}
}
return res;
}
bool_t
_xdr_ping_args (XDR *xdrs, ping_args *objp)
{
if (!_xdr_nis_name (xdrs, &objp->dir))
return FALSE;
if (!xdr_uint32_t (xdrs, &objp->stamp))
return FALSE;
return TRUE;
bool_t res = _xdr_nis_name (xdrs, &objp->dir);
if (__builtin_expect (res, TRUE))
res = xdr_uint32_t (xdrs, &objp->stamp);
return res;
}
bool_t
_xdr_cp_result (XDR *xdrs, cp_result *objp)
{
if (!_xdr_nis_error (xdrs, &objp->cp_status))
return FALSE;
if (!xdr_uint32_t (xdrs, &objp->cp_zticks))
return FALSE;
if (!xdr_uint32_t (xdrs, &objp->cp_dticks))
return FALSE;
return TRUE;
bool_t res = _xdr_nis_error (xdrs, &objp->cp_status);
if (__builtin_expect (res, TRUE))
{
res = xdr_uint32_t (xdrs, &objp->cp_zticks);
if (__builtin_expect (res, TRUE))
res = xdr_uint32_t (xdrs, &objp->cp_dticks);
}
return res;
}
bool_t
_xdr_nis_tag (XDR *xdrs, nis_tag *objp)
{
if (!xdr_u_int (xdrs, &objp->tag_type))
return FALSE;
if (!xdr_string (xdrs, &objp->tag_val, ~0))
return FALSE;
return TRUE;
bool_t res = xdr_u_int (xdrs, &objp->tag_type);
if (__builtin_expect (res, TRUE))
res = xdr_string (xdrs, &objp->tag_val, ~0);
return res;
}
bool_t
_xdr_nis_taglist (XDR *xdrs, nis_taglist *objp)
{
if (!xdr_array (xdrs, (char **) &objp->tags.tags_val,
(u_int *) &objp->tags.tags_len, ~0, sizeof (nis_tag),
(xdrproc_t) _xdr_nis_tag))
return FALSE;
return TRUE;
return xdr_array (xdrs, (char **) &objp->tags.tags_val,
&objp->tags.tags_len, ~0, sizeof (nis_tag),
(xdrproc_t) _xdr_nis_tag);
}
bool_t
_xdr_fd_args (XDR *xdrs, fd_args *objp)
{
if (!_xdr_nis_name (xdrs, &objp->dir_name))
return FALSE;
if (!_xdr_nis_name (xdrs, &objp->requester))
return FALSE;
return TRUE;
bool_t res = _xdr_nis_name (xdrs, &objp->dir_name);
if (__builtin_expect (res, TRUE))
res = _xdr_nis_name (xdrs, &objp->requester);
return res;
}
bool_t
_xdr_fd_result (XDR *xdrs, fd_result *objp)
{
if (!_xdr_nis_error (xdrs, &objp->status))
return FALSE;
if (!_xdr_nis_name (xdrs, &objp->source))
return FALSE;
if (!xdr_bytes (xdrs, (char **) &objp->dir_data.dir_data_val,
(u_int *) &objp->dir_data.dir_data_len, ~0))
return FALSE;
if (!xdr_bytes (xdrs, (char **) &objp->signature.signature_val,
(u_int *) &objp->signature.signature_len, ~0))
return FALSE;
return TRUE;
bool_t res = _xdr_nis_error (xdrs, &objp->status);
if (__builtin_expect (res, TRUE))
{
res = _xdr_nis_name (xdrs, &objp->source);
if (__builtin_expect (res, TRUE))
{
res = xdr_bytes (xdrs, (char **) &objp->dir_data.dir_data_val,
&objp->dir_data.dir_data_len, ~0);
if (__builtin_expect (res, TRUE))
res = xdr_bytes (xdrs, (char **) &objp->signature.signature_val,
&objp->signature.signature_len, ~0);
}
}
return res;
}
/* The following functions have prototypes in nis_callback.h. So
@ -412,18 +430,14 @@ _xdr_fd_result (XDR *xdrs, fd_result *objp)
bool_t
xdr_obj_p (XDR *xdrs, obj_p *objp)
{
if (!xdr_pointer (xdrs, (char **)objp, sizeof (nis_object),
(xdrproc_t)_xdr_nis_object))
return FALSE;
return TRUE;
return xdr_pointer (xdrs, (char **)objp, sizeof (nis_object),
(xdrproc_t)_xdr_nis_object);
}
bool_t
xdr_cback_data (XDR *xdrs, cback_data *objp)
{
if (!xdr_array (xdrs, (char **)&objp->entries.entries_val,
(u_int *) &objp->entries.entries_len, ~0,
sizeof (obj_p), (xdrproc_t) xdr_obj_p))
return FALSE;
return TRUE;
return xdr_array (xdrs, (char **)&objp->entries.entries_val,
&objp->entries.entries_len, ~0,
sizeof (obj_p), (xdrproc_t) xdr_obj_p);
}

10836
po/zh_TW.po
View File

File diff suppressed because it is too large Load Diff

2
stdio-common/fxprintf.c
View File

@ -47,7 +47,7 @@ __fxprintf (FILE *fp, const char *fmt, ...)
res = __vfwprintf (fp, wfmt, ap);
}
else
res = _IO_vfprintf (fp, fmt, ap);
res = INTUSE(_IO_vfprintf) (fp, fmt, ap);
va_end (ap);

39
stdlib/bits/stdlib.h
View File

@ -73,3 +73,42 @@ wctomb (char *__s, wchar_t __wchar)
return __wctomb_chk (__s, __wchar, __bos (__s));
return __wctomb_alias (__s, __wchar);
}
extern size_t __mbstowcs_chk (wchar_t *__restrict __dst,
__const char *__restrict __src,
size_t __len, size_t __dstlen) __THROW;
extern size_t __REDIRECT_NTH (__mbstowcs_alias,
(wchar_t *__restrict __dst,
__const char *__restrict __src,
size_t __len), mbstowcs);
extern __always_inline size_t
mbstowcs (wchar_t *__restrict __dst, __const char *__restrict __src,
size_t __len)
{
if (__bos (__dst) != (size_t) -1
&& (!__builtin_constant_p (__len)
|| __len * sizeof (wchar_t) > __bos (__dst)))
return __mbstowcs_chk (__dst, __src, __len, __bos (__dst));
return __mbstowcs_alias (__dst, __src, __len);
}
extern size_t __wcstombs_chk (char *__restrict __dst,
__const wchar_t *__restrict __src,
size_t __len, size_t __dstlen) __THROW;
extern size_t __REDIRECT_NTH (__wcstombs_alias,
(char *__restrict __dst,
__const wchar_t *__restrict __src,
size_t __len), wcstombs);
extern __always_inline size_t
wcstombs (char *__restrict __dst, __const wchar_t *__restrict __src,
size_t __len)
{
if (__bos (__dst) != (size_t) -1
&& (!__builtin_constant_p (__len) || __len > __bos (__dst)))
return __wcstombs_chk (__dst, __src, __len, __bos (__dst));
return __wcstombs_alias (__dst, __src, __len);
}

2
wcsmbs/bits/wchar2.h
View File

@ -320,7 +320,7 @@ extern size_t __REDIRECT_NTH (__mbsrtowcs_alias,
extern __always_inline size_t
mbsrtowcs (wchar_t *__restrict __dst, __const char **__restrict __src,
size_t __len, mbstate_t *__restrict __ps)
size_t __len, mbstate_t *__restrict __ps)
{
if (__bos (__dst) != (size_t) -1
&& (!__builtin_constant_p (__len)