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.
		
			
				
	
	
		
			141 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			141 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include <stdio.h>
 | |
| #include <rpc/rpc.h>
 | |
| #include <assert.h>
 | |
| 
 | |
| #include <libc-lock.h>
 | |
| #include <libc-tsd.h>
 | |
| #include <shlib-compat.h>
 | |
| 
 | |
| #ifdef _RPC_THREAD_SAFE_
 | |
| 
 | |
| /* Variable used in non-threaded applications or for the first thread.  */
 | |
| static struct rpc_thread_variables __libc_tsd_RPC_VARS_mem;
 | |
| static __thread struct rpc_thread_variables *thread_rpc_vars
 | |
|         attribute_tls_model_ie;
 | |
| 
 | |
| /*
 | |
|  * Task-variable destructor
 | |
|  */
 | |
| void __attribute__ ((section ("__libc_thread_freeres_fn")))
 | |
| __rpc_thread_destroy (void)
 | |
| {
 | |
| 	struct rpc_thread_variables *tvp = thread_rpc_vars;
 | |
| 
 | |
| 	if (tvp != NULL) {
 | |
| 		__rpc_thread_svc_cleanup ();
 | |
| 		__rpc_thread_clnt_cleanup ();
 | |
| 		__rpc_thread_key_cleanup ();
 | |
| 		free (tvp->clnt_perr_buf_s);
 | |
| 		free (tvp->clntraw_private_s);
 | |
| 		free (tvp->svcraw_private_s);
 | |
| 		free (tvp->authdes_cache_s);
 | |
| 		free (tvp->authdes_lru_s);
 | |
| 		free (tvp->svc_xports_s);
 | |
| 		free (tvp->svc_pollfd_s);
 | |
| 		if (tvp != &__libc_tsd_RPC_VARS_mem)
 | |
| 			free (tvp);
 | |
| 		thread_rpc_vars = NULL;
 | |
| 	}
 | |
| }
 | |
| #ifdef _LIBC_REENTRANT
 | |
| text_set_element (__libc_thread_subfreeres, __rpc_thread_destroy);
 | |
| #endif
 | |
| text_set_element (__libc_subfreeres, __rpc_thread_destroy);
 | |
| 
 | |
| 
 | |
| /*
 | |
|  * Initialize RPC multi-threaded operation
 | |
|  */
 | |
| static void
 | |
| rpc_thread_multi (void)
 | |
| {
 | |
|   thread_rpc_vars = &__libc_tsd_RPC_VARS_mem;
 | |
| }
 | |
| 
 | |
| 
 | |
| struct rpc_thread_variables *
 | |
| __rpc_thread_variables (void)
 | |
| {
 | |
| 	__libc_once_define (static, once);
 | |
| 	struct rpc_thread_variables *tvp = thread_rpc_vars;
 | |
| 
 | |
| 	if (tvp == NULL) {
 | |
| 		__libc_once (once, rpc_thread_multi);
 | |
| 		tvp = thread_rpc_vars;
 | |
| 		if (tvp == NULL) {
 | |
| 			tvp = calloc (1, sizeof *tvp);
 | |
| 			if (tvp != NULL)
 | |
| 				thread_rpc_vars = tvp;
 | |
| 		}
 | |
| 	}
 | |
| 	return tvp;
 | |
| }
 | |
| 
 | |
| 
 | |
| /* Global variables If we're single-threaded, or if this is the first
 | |
|    thread using the variable, use the existing global variable.  This
 | |
|    provides backwards compatibility for existing applications which
 | |
|    dynamically link against this code.  */
 | |
| #undef svc_fdset
 | |
| #undef rpc_createerr
 | |
| #undef svc_pollfd
 | |
| #undef svc_max_pollfd
 | |
| 
 | |
| fd_set *
 | |
| __rpc_thread_svc_fdset (void)
 | |
| {
 | |
| 	struct rpc_thread_variables *tvp;
 | |
| 
 | |
| 	tvp = __rpc_thread_variables ();
 | |
| 	if (tvp == &__libc_tsd_RPC_VARS_mem)
 | |
| 		return &svc_fdset;
 | |
| 	return &tvp->svc_fdset_s;
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (__rpc_thread_svc_fdset, GLIBC_2_2_3)
 | |
| 
 | |
| struct rpc_createerr *
 | |
| __rpc_thread_createerr (void)
 | |
| {
 | |
| 	struct rpc_thread_variables *tvp;
 | |
| 
 | |
| 	tvp = __rpc_thread_variables ();
 | |
| 	if (tvp == &__libc_tsd_RPC_VARS_mem)
 | |
| 		return &rpc_createerr;
 | |
| 	return &tvp->rpc_createerr_s;
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (__rpc_thread_createerr, GLIBC_2_2_3)
 | |
| 
 | |
| struct pollfd **
 | |
| __rpc_thread_svc_pollfd (void)
 | |
| {
 | |
| 	struct rpc_thread_variables *tvp;
 | |
| 
 | |
| 	tvp = __rpc_thread_variables ();
 | |
| 	if (tvp == &__libc_tsd_RPC_VARS_mem)
 | |
| 		return &svc_pollfd;
 | |
| 	return &tvp->svc_pollfd_s;
 | |
| }
 | |
| #ifdef EXPORT_RPC_SYMBOLS
 | |
| libc_hidden_def (__rpc_thread_svc_pollfd)
 | |
| #else
 | |
| libc_hidden_nolink_sunrpc (__rpc_thread_svc_pollfd, GLIBC_2_2_3)
 | |
| #endif
 | |
| 
 | |
| int *
 | |
| __rpc_thread_svc_max_pollfd (void)
 | |
| {
 | |
| 	struct rpc_thread_variables *tvp;
 | |
| 
 | |
| 	tvp = __rpc_thread_variables ();
 | |
| 	if (tvp == &__libc_tsd_RPC_VARS_mem)
 | |
| 		return &svc_max_pollfd;
 | |
| 	return &tvp->svc_max_pollfd_s;
 | |
| }
 | |
| #ifdef EXPORT_RPC_SYMBOLS
 | |
| libc_hidden_def (__rpc_thread_svc_max_pollfd)
 | |
| #else
 | |
| libc_hidden_nolink_sunrpc (__rpc_thread_svc_max_pollfd, GLIBC_2_2_3)
 | |
| #endif
 | |
| 
 | |
| #endif /* _RPC_THREAD_SAFE_ */
 |