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.
		
			
				
	
	
		
			167 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			167 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * xdr_sizeof.c
 | |
|  *
 | |
|  * Copyright (c) 2010, Oracle America, Inc.
 | |
|  *
 | |
|  * Redistribution and use in source and binary forms, with or without
 | |
|  * modification, are permitted provided that the following conditions are
 | |
|  * met:
 | |
|  *
 | |
|  *     * Redistributions of source code must retain the above copyright
 | |
|  *       notice, this list of conditions and the following disclaimer.
 | |
|  *     * Redistributions in binary form must reproduce the above
 | |
|  *       copyright notice, this list of conditions and the following
 | |
|  *       disclaimer in the documentation and/or other materials
 | |
|  *       provided with the distribution.
 | |
|  *     * Neither the name of the "Oracle America, Inc." nor the names of its
 | |
|  *       contributors may be used to endorse or promote products derived
 | |
|  *       from this software without specific prior written permission.
 | |
|  *
 | |
|  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 | |
|  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 | |
|  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 | |
|  *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
 | |
|  *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
 | |
|  *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 | |
|  *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 | |
|  *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 | |
|  *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 | |
|  *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 | |
|  *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 | |
|  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 | |
|  *
 | |
|  * General purpose routine to see how much space something will use
 | |
|  * when serialized using XDR.
 | |
|  */
 | |
| 
 | |
| #include <rpc/types.h>
 | |
| #include <rpc/xdr.h>
 | |
| #include <sys/types.h>
 | |
| #include <stdlib.h>
 | |
| #include <shlib-compat.h>
 | |
| 
 | |
| /* ARGSUSED */
 | |
| static bool_t
 | |
| x_putlong (XDR *xdrs, const long *longp)
 | |
| {
 | |
|   xdrs->x_handy += BYTES_PER_XDR_UNIT;
 | |
|   return TRUE;
 | |
| }
 | |
| 
 | |
| /* ARGSUSED */
 | |
| static bool_t
 | |
| x_putbytes (XDR *xdrs, const char *bp, u_int len)
 | |
| {
 | |
|   xdrs->x_handy += len;
 | |
|   return TRUE;
 | |
| }
 | |
| 
 | |
| static u_int
 | |
| x_getpostn (const XDR *xdrs)
 | |
| {
 | |
|   return xdrs->x_handy;
 | |
| }
 | |
| 
 | |
| /* ARGSUSED */
 | |
| static bool_t
 | |
| x_setpostn (XDR *xdrs, u_int len)
 | |
| {
 | |
|   /* This is not allowed */
 | |
|   return FALSE;
 | |
| }
 | |
| 
 | |
| static int32_t *
 | |
| x_inline (XDR *xdrs, u_int len)
 | |
| {
 | |
|   if (len == 0)
 | |
|     return NULL;
 | |
|   if (xdrs->x_op != XDR_ENCODE)
 | |
|     return NULL;
 | |
|   if (len < (u_int) (long int) xdrs->x_base)
 | |
|     {
 | |
|       /* x_private was already allocated */
 | |
|       xdrs->x_handy += len;
 | |
|       return (int32_t *) xdrs->x_private;
 | |
|     }
 | |
|   else
 | |
|     {
 | |
|       /* Free the earlier space and allocate new area */
 | |
|       free (xdrs->x_private);
 | |
|       if ((xdrs->x_private = (caddr_t) malloc (len)) == NULL)
 | |
| 	{
 | |
| 	  xdrs->x_base = 0;
 | |
| 	  return NULL;
 | |
| 	}
 | |
|       xdrs->x_base = (void *) (long) len;
 | |
|       xdrs->x_handy += len;
 | |
|       return (int32_t *) xdrs->x_private;
 | |
|     }
 | |
| }
 | |
| 
 | |
| static int
 | |
| harmless (void)
 | |
| {
 | |
|   /* Always return FALSE/NULL, as the case may be */
 | |
|   return 0;
 | |
| }
 | |
| 
 | |
| static void
 | |
| x_destroy (XDR *xdrs)
 | |
| {
 | |
|   xdrs->x_handy = 0;
 | |
|   xdrs->x_base = 0;
 | |
|   if (xdrs->x_private)
 | |
|     {
 | |
|       free (xdrs->x_private);
 | |
|       xdrs->x_private = NULL;
 | |
|     }
 | |
|   return;
 | |
| }
 | |
| 
 | |
| static bool_t
 | |
| x_putint32 (XDR *xdrs, const int32_t *int32p)
 | |
| {
 | |
|   xdrs->x_handy += BYTES_PER_XDR_UNIT;
 | |
|   return TRUE;
 | |
| }
 | |
| 
 | |
| unsigned long
 | |
| xdr_sizeof (xdrproc_t func, void *data)
 | |
| {
 | |
|   XDR x;
 | |
|   struct xdr_ops ops;
 | |
|   bool_t stat;
 | |
|   /* to stop ANSI-C compiler from complaining */
 | |
|   typedef bool_t (*dummyfunc1) (XDR *, long *);
 | |
|   typedef bool_t (*dummyfunc2) (XDR *, caddr_t, u_int);
 | |
|   typedef bool_t (*dummyfunc3) (XDR *, int32_t *);
 | |
| 
 | |
|   ops.x_putlong = x_putlong;
 | |
|   ops.x_putbytes = x_putbytes;
 | |
|   ops.x_inline = x_inline;
 | |
|   ops.x_getpostn = x_getpostn;
 | |
|   ops.x_setpostn = x_setpostn;
 | |
|   ops.x_destroy = x_destroy;
 | |
|   ops.x_putint32 = x_putint32;
 | |
| 
 | |
|   /* the other harmless ones */
 | |
|   ops.x_getlong = (dummyfunc1) harmless;
 | |
|   ops.x_getbytes = (dummyfunc2) harmless;
 | |
|   ops.x_getint32 = (dummyfunc3) harmless;
 | |
| 
 | |
|   x.x_op = XDR_ENCODE;
 | |
|   x.x_ops = &ops;
 | |
|   x.x_handy = 0;
 | |
|   x.x_private = (caddr_t) NULL;
 | |
|   x.x_base = (caddr_t) 0;
 | |
| 
 | |
|   stat = func (&x, data);
 | |
|   free (x.x_private);
 | |
|   return stat == TRUE ? x.x_handy : 0;
 | |
| }
 | |
| #ifdef EXPORT_RPC_SYMBOLS
 | |
| libc_hidden_def (xdr_sizeof)
 | |
| #else
 | |
| libc_hidden_nolink_sunrpc (xdr_sizeof, GLIBC_2_1)
 | |
| #endif
 |