mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +03:00 
			
		
		
		
	This patch consolidates all the non cancellable close calls to use
the __close_nocancel{_nostatus} identifier.  For non cancellable targets
it will be just a macro to call the default respective symbol while on Linux
will be a internal one.
Also, since it is used on libcrypto it is also exported in GLIBC_PRIVATE
namespace.
Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu.
	* sysdeps/generic/not-cancel.h (close_not_cancel): Remove macro.
	(close_not_cancel_no_status): Likewise.
	(__close_nocancel): New macro.
	(__close_nocancel_no_status): Likewise.
	* sysdeps/unix/sysv/linux/not-cancel.h (__close_nocancel): Remove
	macro.
	(close_not_cancel): Likewise.
	(close_not_cancel_no_status): Likewise.
	(__close_nocancel): New prototype.
	(__close_nocancel_no_status): New function.
	* sysdeps/unix/sysv/linux/close.c (__close_nocancel): New function.
	* catgets/open_catalog.c (__open_catalog): Replace
	close_not_cancel{_no_status) with __close_nocancel{_nostatus}.
	* gmon/gmon.c (write_gmon): Likewise.
	* iconv/gconv_cache.c (__gconv_load_cache): Likewise.
	* intl/loadmsgcat.c (close): Likewise.
	* io/ftw.c (open_dir_stream): Likewise.
	(ftw_startup): Likewise.
	* libio/fileops.c (_IO_file_open): Likewise.
	(_IO_file_close_mmap): Likewise.
	(_IO_file_close): Likewise.
	* libio/iopopen.c (_IO_dup2): Likewise.
	* locale/loadarchive.c (_nl_load_locale_from_archive): Likewise.
	* locale/loadlocale.c (_nl_load_locale): Likewise.
	* login/utmp_file.c (pututline_file): Likewise.
	(endutent_file): Likewise.
	* misc/daemon.c (daemon): Likewise.
	* nscd/nscd_getai.c (__nscd_getai): Likewise.
	* nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise.
	* nscd/nscd_gethst_r.c (nscd_gethst_r): Likewise.
	* nscd/nscd_getpw_r.c (nscd_getpw_r): Likewise.
	* nscd/nscd_getserv_r.c (nscd_getserv_r): Likewise.
	* nscd/nscd_helper.c (open_socket): Likewise.
	(__nscd_open_socket): Likewise.
	* nscd/nscd_initgroups.c (__nscd_getgrouplist): Likewise.
	* nscd/nscd_netgroup.c (__nscd_setnetgrent): Likewise.
	(__nscd_innetgr): Likewise.
	* nss/nss_db/db-open.c (internal_setent): Likewise.
	* resolv/res-close.c (__res_iclose): Likewise.
	* sunrpc/pm_getmaps.c (pmap_getmaps): Likewise.
	* sysdeps/posix/closedir.c (__closedir): Likewise.
	* sysdeps/posix/getaddrinfo.c (getaddrinfo): Likewise.
	* sysdeps/posix/getcwd.c (__getcwd): Likewise.
	* sysdeps/posix/opendir.c (tryopen_o_directory): Likewise.
	(opendir_tail): Likewise.
	* sysdeps/posix/spawni.c (__spawni_child): Likewise.
	* sysdeps/unix/sysv/linux/check_native.c (__check_native): Likewise.
	* sysdeps/unix/sysv/linux/check_pf.c (__check_pf): Likewise.
	* sysdeps/unix/sysv/linux/fips-private.h (fips_enabled_p): Likewise.
	* sysdeps/unix/sysv/linux/gethostid.c (sethostid): Likewise.
	(gethostid): Likewise.
	* sysdeps/unix/sysv/linux/getloadavg.c (getloadavg): Likewise.
	* sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid):
	Likewise.
	* sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Likewise.
	* sysdeps/unix/sysv/linux/grantpt.c (close_all_fds): Likewise.
	* sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Likewise.
	* sysdeps/unix/sysv/linux/ia64/has_cpuclock.c (has_cpuclock):
	Likewise.
	* sysdeps/unix/sysv/linux/if_index.c (__if_nametoindex): Likewise.
	* sysdeps/unix/sysv/linux/libc_fatal.c (backtrace_and_maps): Likewise.
	* sysdeps/unix/sysv/linux/malloc-sysdep.h (check_may_shrink_heap):
	Likewise.
	* sysdeps/unix/sysv/linux/mq_notify.c (init_mq_netlink): Likewise.
	* sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np):
	Likewise.
	* sysdeps/unix/sysv/linux/pthread_setname.c (pthread_setname_np):
	Likewise.
	* sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Likewise.
	* sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Likewise.
		
	
		
			
				
	
	
		
			179 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			179 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
libc {
 | 
						|
  # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
 | 
						|
  # When you get an error from errlist-compat.awk, you need to add a new
 | 
						|
  # version here.  Don't do this blindly, since this means changing the ABI
 | 
						|
  # for all GNU/Linux configurations.
 | 
						|
 | 
						|
  GLIBC_2.0 {
 | 
						|
    # functions used in inline functions or macros
 | 
						|
    __cmsg_nxthdr;
 | 
						|
 | 
						|
    # functions used in other libraries
 | 
						|
    __clone;
 | 
						|
 | 
						|
    # helper functions
 | 
						|
    __errno_location;
 | 
						|
 | 
						|
    # b*
 | 
						|
    bdflush;
 | 
						|
 | 
						|
    # c*
 | 
						|
    clone; create_module;
 | 
						|
 | 
						|
    # d*
 | 
						|
    delete_module;
 | 
						|
 | 
						|
    # g*
 | 
						|
    get_kernel_syms; getresgid; getresuid;
 | 
						|
 | 
						|
    # i*
 | 
						|
    init_module;
 | 
						|
 | 
						|
    # k*
 | 
						|
    klogctl;
 | 
						|
 | 
						|
    # l*
 | 
						|
    llseek;
 | 
						|
 | 
						|
    # m*
 | 
						|
    mremap;
 | 
						|
 | 
						|
    # n*
 | 
						|
    nfsservctl;
 | 
						|
 | 
						|
    # p*
 | 
						|
    personality; prctl;
 | 
						|
 | 
						|
    # q*
 | 
						|
    query_module; quotactl;
 | 
						|
 | 
						|
    # s*
 | 
						|
    setfsgid; setfsuid;
 | 
						|
 | 
						|
    # s*
 | 
						|
    setresgid; setresuid; swapoff; swapon; sysctl; sysinfo;
 | 
						|
 | 
						|
    # u*
 | 
						|
    umount; uselib;
 | 
						|
 | 
						|
    #errlist-compat	123
 | 
						|
    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
 | 
						|
  }
 | 
						|
  GLIBC_2.1 {
 | 
						|
    # functions used in inline functions or macros
 | 
						|
    __libc_sa_len;
 | 
						|
 | 
						|
    # Since we have new signals this structure changed.
 | 
						|
    _sys_siglist; sys_siglist; sys_sigabbrev;
 | 
						|
 | 
						|
    # New errlist.
 | 
						|
    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
 | 
						|
 | 
						|
    # chown interface change.
 | 
						|
    chown;
 | 
						|
 | 
						|
    # Change in pthread_attr_t.
 | 
						|
    pthread_attr_init;
 | 
						|
 | 
						|
    # c*
 | 
						|
    capget; capset;
 | 
						|
 | 
						|
    # n*
 | 
						|
    ntp_adjtime; ntp_gettime;
 | 
						|
 | 
						|
    # u*
 | 
						|
    umount2;
 | 
						|
 | 
						|
    #errlist-compat	125
 | 
						|
    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
 | 
						|
  }
 | 
						|
  GLIBC_2.2 {
 | 
						|
    # needed in other libraries.
 | 
						|
    __endmntent; __getmntent_r; __setmntent; __statfs; __sysctl;
 | 
						|
 | 
						|
    # ipc ctl interface change.
 | 
						|
    semctl; shmctl; msgctl;
 | 
						|
  }
 | 
						|
  GLIBC_2.2.1 {
 | 
						|
    # p*
 | 
						|
    pivot_root;
 | 
						|
  }
 | 
						|
  GLIBC_2.3 {
 | 
						|
    # r*
 | 
						|
    readahead;
 | 
						|
 | 
						|
    #errlist-compat	126
 | 
						|
    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
 | 
						|
  }
 | 
						|
  GLIBC_2.3.2 {
 | 
						|
    # New kernel interfaces.
 | 
						|
    epoll_create; epoll_ctl; epoll_wait;
 | 
						|
  }
 | 
						|
  GLIBC_2.3.3 {
 | 
						|
    gnu_dev_major; gnu_dev_minor; gnu_dev_makedev;
 | 
						|
  }
 | 
						|
  GLIBC_2.3.4 {
 | 
						|
    sched_getaffinity; sched_setaffinity;
 | 
						|
  }
 | 
						|
  GLIBC_2.4 {
 | 
						|
    inotify_init; inotify_add_watch; inotify_rm_watch;
 | 
						|
 | 
						|
    unshare;
 | 
						|
 | 
						|
    #errlist-compat	132
 | 
						|
    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
 | 
						|
  }
 | 
						|
  GLIBC_2.5 {
 | 
						|
    splice; tee; vmsplice;
 | 
						|
  }
 | 
						|
  GLIBC_2.6 {
 | 
						|
    epoll_pwait; sync_file_range; sched_getcpu;
 | 
						|
  }
 | 
						|
  GLIBC_2.7 {
 | 
						|
    eventfd; eventfd_read; eventfd_write; signalfd;
 | 
						|
  }
 | 
						|
  GLIBC_2.8 {
 | 
						|
    timerfd_create; timerfd_settime; timerfd_gettime;
 | 
						|
  }
 | 
						|
  GLIBC_2.9 {
 | 
						|
    epoll_create1; inotify_init1;
 | 
						|
  }
 | 
						|
  GLIBC_2.10 {
 | 
						|
    fallocate;
 | 
						|
  }
 | 
						|
  GLIBC_2.12 {
 | 
						|
    #errlist-compat	135
 | 
						|
    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
 | 
						|
 | 
						|
    ntp_gettimex;
 | 
						|
 | 
						|
    recvmmsg;
 | 
						|
  }
 | 
						|
  GLIBC_2.13 {
 | 
						|
    prlimit; prlimit64;
 | 
						|
 | 
						|
    fanotify_init; fanotify_mark;
 | 
						|
  }
 | 
						|
  GLIBC_2.14 {
 | 
						|
    clock_adjtime;
 | 
						|
 | 
						|
    name_to_handle_at; open_by_handle_at;
 | 
						|
 | 
						|
    setns;
 | 
						|
 | 
						|
    sendmmsg;
 | 
						|
  }
 | 
						|
  GLIBC_2.15 {
 | 
						|
    process_vm_readv; process_vm_writev;
 | 
						|
  }
 | 
						|
  GLIBC_PRIVATE {
 | 
						|
    # functions used in other libraries
 | 
						|
    __syscall_rt_sigqueueinfo;
 | 
						|
    __open_nocancel;
 | 
						|
    __read_nocancel;
 | 
						|
    __close_nocancel;
 | 
						|
    # functions used by nscd
 | 
						|
    __netlink_assert_response;
 | 
						|
  }
 | 
						|
}
 |