mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	Every file that uses libc_hidden_nolink_sunrpc or libnsl_hidden_nolink_def needs to include shlib-compat.h. Currently, most of them are getting it via stdio.h, because libio.h refers to SHLIB_COMPAT when _LIBC is defined, so it includes shlib-compat.h. My experimental patch to not install libio.h breaks that chain; stdio.h no longer pulls in libio.h even for internal users. Accordingly, this patch adds #include <shlib-compat.h> to many files in sunrpc/ and nis/. There are also a small number of really obvious fixups to includes that caught my eye while proofreading the patch - not including headers twice in a row, not worrying about portability to Ultrix anymore, sort of thing. * nis/nis_add.c, nis/nis_addmember.c, nis/nis_call.c * nis/nis_checkpoint.c, nis/nis_clone_dir.c, nis/nis_clone_obj.c * nis/nis_clone_res.c, nis/nis_creategroup.c, nis/nis_defaults.c * nis/nis_destroygroup.c, nis/nis_domain_of.c * nis/nis_domain_of_r.c, nis/nis_error.c, nis/nis_file.c * nis/nis_free.c, nis/nis_getservlist.c, nis/nis_ismember.c * nis/nis_local_names.c, nis/nis_lookup.c, nis/nis_mkdir.c * nis/nis_modify.c, nis/nis_ping.c, nis/nis_print.c * nis/nis_print_group_entry.c, nis/nis_remove.c * nis/nis_removemember.c, nis/nis_rmdir.c, nis/nis_server.c * nis/nis_subr.c, nis/nis_table.c, nis/nis_util.c * nis/nis_verifygroup.c, nis/nis_xdr.c, nis/yp_xdr.c * nis/ypclnt.c, nis/ypupdate_xdr.c, sunrpc/auth_des.c * sunrpc/auth_none.c, sunrpc/auth_unix.c, sunrpc/authdes_prot.c * sunrpc/authuxprot.c, sunrpc/clnt_gen.c, sunrpc/clnt_perr.c * sunrpc/clnt_raw.c, sunrpc/clnt_simp.c, sunrpc/clnt_tcp.c * sunrpc/clnt_udp.c, sunrpc/clnt_unix.c, sunrpc/des_crypt.c * sunrpc/des_soft.c, sunrpc/get_myaddr.c, sunrpc/key_call.c * sunrpc/key_prot.c, sunrpc/netname.c, sunrpc/pm_getmaps.c * sunrpc/pm_getport.c, sunrpc/pmap_clnt.c, sunrpc/pmap_prot.c * sunrpc/pmap_prot2.c, sunrpc/pmap_rmt.c, sunrpc/publickey.c * sunrpc/rpc_cmsg.c, sunrpc/rpc_dtable.c, sunrpc/rpc_prot.c * sunrpc/rpc_thread.c, sunrpc/rtime.c, sunrpc/svc.c * sunrpc/svc_auth.c, sunrpc/svc_raw.c, sunrpc/svc_run.c * sunrpc/svc_tcp.c, sunrpc/svc_udp.c, sunrpc/svc_unix.c * sunrpc/svcauth_des.c, sunrpc/xdr.c, sunrpc/xdr_array.c * sunrpc/xdr_float.c, sunrpc/xdr_intXX_t.c, sunrpc/xdr_mem.c * sunrpc/xdr_rec.c, sunrpc/xdr_ref.c, sunrpc/xdr_sizeof.c * sunrpc/xdr_stdio.c: Include shlib-compat.h. * sunrpc/des_crypt.c, sunrpc/des_soft.c: No need to include abi-versions.h as well as shlib-compat.h. * sunrpc/get_myaddr.c: Remove obsolete comment. * sunrpc/pmap_rmt.c: Remove obsolete comment and #undef. * sunrpc/rpc_thread.c: Include libc-lock.h only once. * resolv/res_libc.c: Include shlib-compat.h only once.
		
			
				
	
	
		
			231 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			231 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Copyright (c) 1998-2017 Free Software Foundation, Inc.
 | |
|    This file is part of the GNU C Library.
 | |
|    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
 | |
| 
 | |
|    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, see
 | |
|    <http://www.gnu.org/licenses/>.  */
 | |
| 
 | |
| #include <rpc/types.h>
 | |
| 
 | |
| /* We play dirty tricks with aliases.  */
 | |
| #include <rpc/xdr.h>
 | |
| 
 | |
| #include <stdint.h>
 | |
| #include <shlib-compat.h>
 | |
| 
 | |
| /* XDR 64bit integers */
 | |
| bool_t
 | |
| xdr_int64_t (XDR *xdrs, int64_t *ip)
 | |
| {
 | |
|   int32_t t1, t2;
 | |
| 
 | |
|   switch (xdrs->x_op)
 | |
|     {
 | |
|     case XDR_ENCODE:
 | |
|       t1 = (int32_t) ((*ip) >> 32);
 | |
|       t2 = (int32_t) (*ip);
 | |
|       return (XDR_PUTINT32(xdrs, &t1) && XDR_PUTINT32(xdrs, &t2));
 | |
|     case XDR_DECODE:
 | |
|       if (!XDR_GETINT32(xdrs, &t1) || !XDR_GETINT32(xdrs, &t2))
 | |
| 	return FALSE;
 | |
|       *ip = ((int64_t) t1) << 32;
 | |
|       *ip |= (uint32_t) t2;	/* Avoid sign extension.  */
 | |
|       return TRUE;
 | |
|     case XDR_FREE:
 | |
|       return TRUE;
 | |
|     default:
 | |
|       return FALSE;
 | |
|     }
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (xdr_int64_t, GLIBC_2_1_1)
 | |
| 
 | |
| bool_t
 | |
| xdr_quad_t (XDR *xdrs, quad_t *ip)
 | |
| {
 | |
|   return xdr_int64_t (xdrs, (int64_t *) ip);
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (xdr_quad_t, GLIBC_2_3_4)
 | |
| 
 | |
| /* XDR 64bit unsigned integers */
 | |
| bool_t
 | |
| xdr_uint64_t (XDR *xdrs, uint64_t *uip)
 | |
| {
 | |
|   uint32_t t1;
 | |
|   uint32_t t2;
 | |
| 
 | |
|   switch (xdrs->x_op)
 | |
|     {
 | |
|     case XDR_ENCODE:
 | |
|       t1 = (uint32_t) ((*uip) >> 32);
 | |
|       t2 = (uint32_t) (*uip);
 | |
|       return (XDR_PUTINT32 (xdrs, (int32_t *) &t1) &&
 | |
| 	      XDR_PUTINT32(xdrs, (int32_t *) &t2));
 | |
|     case XDR_DECODE:
 | |
|       if (!XDR_GETINT32(xdrs, (int32_t *) &t1) ||
 | |
| 	  !XDR_GETINT32(xdrs, (int32_t *) &t2))
 | |
| 	return FALSE;
 | |
|       *uip = ((uint64_t) t1) << 32;
 | |
|       *uip |= t2;
 | |
|       return TRUE;
 | |
|     case XDR_FREE:
 | |
|       return TRUE;
 | |
|     default:
 | |
|       return FALSE;
 | |
|     }
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (xdr_uint64_t, GLIBC_2_1_1)
 | |
| 
 | |
| bool_t
 | |
| xdr_u_quad_t (XDR *xdrs, u_quad_t *ip)
 | |
| {
 | |
|   return xdr_uint64_t (xdrs, (uint64_t *) ip);
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (xdr_u_quad_t, GLIBC_2_3_4)
 | |
| 
 | |
| /* XDR 32bit integers */
 | |
| bool_t
 | |
| xdr_int32_t (XDR *xdrs, int32_t *lp)
 | |
| {
 | |
|   switch (xdrs->x_op)
 | |
|     {
 | |
|     case XDR_ENCODE:
 | |
|       return XDR_PUTINT32 (xdrs, lp);
 | |
|     case XDR_DECODE:
 | |
|       return XDR_GETINT32 (xdrs, lp);
 | |
|     case XDR_FREE:
 | |
|       return TRUE;
 | |
|     default:
 | |
|       return FALSE;
 | |
|     }
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (xdr_int32_t, GLIBC_2_1)
 | |
| 
 | |
| /* XDR 32bit unsigned integers */
 | |
| bool_t
 | |
| xdr_uint32_t (XDR *xdrs, uint32_t *ulp)
 | |
| {
 | |
|   switch (xdrs->x_op)
 | |
|     {
 | |
|     case XDR_ENCODE:
 | |
|       return XDR_PUTINT32 (xdrs, (int32_t *) ulp);
 | |
|     case XDR_DECODE:
 | |
|       return XDR_GETINT32 (xdrs, (int32_t *) ulp);
 | |
|     case XDR_FREE:
 | |
|       return TRUE;
 | |
|     default:
 | |
|       return FALSE;
 | |
|     }
 | |
| }
 | |
| #ifdef EXPORT_RPC_SYMBOLS
 | |
| libc_hidden_def (xdr_uint32_t)
 | |
| #else
 | |
| libc_hidden_nolink_sunrpc (xdr_uint32_t, GLIBC_2_1)
 | |
| #endif
 | |
| 
 | |
| /* XDR 16bit integers */
 | |
| bool_t
 | |
| xdr_int16_t (XDR *xdrs, int16_t *ip)
 | |
| {
 | |
|   int32_t t;
 | |
| 
 | |
|   switch (xdrs->x_op)
 | |
|     {
 | |
|     case XDR_ENCODE:
 | |
|       t = (int32_t) *ip;
 | |
|       return XDR_PUTINT32 (xdrs, &t);
 | |
|     case XDR_DECODE:
 | |
|       if (!XDR_GETINT32 (xdrs, &t))
 | |
| 	return FALSE;
 | |
|       *ip = (int16_t) t;
 | |
|       return TRUE;
 | |
|     case XDR_FREE:
 | |
|       return TRUE;
 | |
|     default:
 | |
|       return FALSE;
 | |
|     }
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (xdr_int16_t, GLIBC_2_1)
 | |
| 
 | |
| /* XDR 16bit unsigned integers */
 | |
| bool_t
 | |
| xdr_uint16_t (XDR *xdrs, uint16_t *uip)
 | |
| {
 | |
|   uint32_t ut;
 | |
| 
 | |
|   switch (xdrs->x_op)
 | |
|     {
 | |
|     case XDR_ENCODE:
 | |
|       ut = (uint32_t) *uip;
 | |
|       return XDR_PUTINT32 (xdrs, (int32_t *) &ut);
 | |
|     case XDR_DECODE:
 | |
|       if (!XDR_GETINT32 (xdrs, (int32_t *) &ut))
 | |
| 	return FALSE;
 | |
|       *uip = (uint16_t) ut;
 | |
|       return TRUE;
 | |
|     case XDR_FREE:
 | |
|       return TRUE;
 | |
|     default:
 | |
|       return FALSE;
 | |
|     }
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (xdr_uint16_t, GLIBC_2_1)
 | |
| 
 | |
| /* XDR 8bit integers */
 | |
| bool_t
 | |
| xdr_int8_t (XDR *xdrs, int8_t *ip)
 | |
| {
 | |
|   int32_t t;
 | |
| 
 | |
|   switch (xdrs->x_op)
 | |
|     {
 | |
|     case XDR_ENCODE:
 | |
|       t = (int32_t) *ip;
 | |
|       return XDR_PUTINT32 (xdrs, &t);
 | |
|     case XDR_DECODE:
 | |
|       if (!XDR_GETINT32 (xdrs, &t))
 | |
| 	return FALSE;
 | |
|       *ip = (int8_t) t;
 | |
|       return TRUE;
 | |
|     case XDR_FREE:
 | |
|       return TRUE;
 | |
|     default:
 | |
|       return FALSE;
 | |
|     }
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (xdr_int8_t, GLIBC_2_1)
 | |
| 
 | |
| /* XDR 8bit unsigned integers */
 | |
| bool_t
 | |
| xdr_uint8_t (XDR *xdrs, uint8_t *uip)
 | |
| {
 | |
|   uint32_t ut;
 | |
| 
 | |
|   switch (xdrs->x_op)
 | |
|     {
 | |
|     case XDR_ENCODE:
 | |
|       ut = (uint32_t) *uip;
 | |
|       return XDR_PUTINT32 (xdrs, (int32_t *) &ut);
 | |
|     case XDR_DECODE:
 | |
|       if (!XDR_GETINT32 (xdrs, (int32_t *) &ut))
 | |
| 	return FALSE;
 | |
|       *uip = (uint8_t) ut;
 | |
|       return TRUE;
 | |
|     case XDR_FREE:
 | |
|       return TRUE;
 | |
|     default:
 | |
|       return FALSE;
 | |
|     }
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (xdr_uint8_t, GLIBC_2_1)
 |