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.
		
	
		
			
				
	
	
		
			147 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			147 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Get file-specific information about a file.  Linux version.
 | 
						|
   Copyright (C) 2003-2017 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, see
 | 
						|
   <http://www.gnu.org/licenses/>.  */
 | 
						|
 | 
						|
#include <errno.h>
 | 
						|
#include <fcntl.h>
 | 
						|
#include <stdlib.h>
 | 
						|
#include <sysdep.h>
 | 
						|
#include <time.h>
 | 
						|
#include <unistd.h>
 | 
						|
#include <sys/resource.h>
 | 
						|
#include <sys/param.h>
 | 
						|
#include <not-cancel.h>
 | 
						|
#include <ldsodefs.h>
 | 
						|
 | 
						|
/* Legacy value of ARG_MAX.  The macro is now not defined since the
 | 
						|
   actual value varies based on the stack size.  */
 | 
						|
#define legacy_ARG_MAX 131072
 | 
						|
 | 
						|
 | 
						|
static long int posix_sysconf (int name);
 | 
						|
 | 
						|
 | 
						|
#ifndef HAS_CPUCLOCK
 | 
						|
static long int
 | 
						|
has_cpuclock (int name)
 | 
						|
{
 | 
						|
# if defined __NR_clock_getres || HP_TIMING_AVAIL
 | 
						|
  /* If we have HP_TIMING, we will fall back on that if the system
 | 
						|
     call does not work, so we support it either way.  */
 | 
						|
#  if !HP_TIMING_AVAIL
 | 
						|
  /* Check using the clock_getres system call.  */
 | 
						|
  struct timespec ts;
 | 
						|
  INTERNAL_SYSCALL_DECL (err);
 | 
						|
  int r = INTERNAL_SYSCALL (clock_getres, err, 2,
 | 
						|
			    (name == _SC_CPUTIME
 | 
						|
			     ? CLOCK_PROCESS_CPUTIME_ID
 | 
						|
			     : CLOCK_THREAD_CPUTIME_ID),
 | 
						|
			    &ts);
 | 
						|
  if (INTERNAL_SYSCALL_ERROR_P (r, err))
 | 
						|
    return -1;
 | 
						|
#  endif
 | 
						|
  return _POSIX_VERSION;
 | 
						|
# else
 | 
						|
  return -1;
 | 
						|
# endif
 | 
						|
}
 | 
						|
# define HAS_CPUCLOCK(name) has_cpuclock (name)
 | 
						|
#endif
 | 
						|
 | 
						|
 | 
						|
/* Get the value of the system variable NAME.  */
 | 
						|
long int
 | 
						|
__sysconf (int name)
 | 
						|
{
 | 
						|
  const char *procfname = NULL;
 | 
						|
 | 
						|
  switch (name)
 | 
						|
    {
 | 
						|
      struct rlimit rlimit;
 | 
						|
#ifdef __NR_clock_getres
 | 
						|
    case _SC_MONOTONIC_CLOCK:
 | 
						|
      /* Check using the clock_getres system call.  */
 | 
						|
      {
 | 
						|
	struct timespec ts;
 | 
						|
	INTERNAL_SYSCALL_DECL (err);
 | 
						|
	int r;
 | 
						|
	r = INTERNAL_SYSCALL (clock_getres, err, 2, CLOCK_MONOTONIC, &ts);
 | 
						|
	return INTERNAL_SYSCALL_ERROR_P (r, err) ? -1 : _POSIX_VERSION;
 | 
						|
      }
 | 
						|
#endif
 | 
						|
 | 
						|
    case _SC_CPUTIME:
 | 
						|
    case _SC_THREAD_CPUTIME:
 | 
						|
      return HAS_CPUCLOCK (name);
 | 
						|
 | 
						|
    case _SC_ARG_MAX:
 | 
						|
      /* Use getrlimit to get the stack limit.  */
 | 
						|
      if (__getrlimit (RLIMIT_STACK, &rlimit) == 0)
 | 
						|
	return MAX (legacy_ARG_MAX, rlimit.rlim_cur / 4);
 | 
						|
 | 
						|
      return legacy_ARG_MAX;
 | 
						|
 | 
						|
    case _SC_NGROUPS_MAX:
 | 
						|
      /* Try to read the information from the /proc/sys/kernel/ngroups_max
 | 
						|
	 file.  */
 | 
						|
      procfname = "/proc/sys/kernel/ngroups_max";
 | 
						|
      break;
 | 
						|
 | 
						|
    case _SC_SIGQUEUE_MAX:
 | 
						|
      if (__getrlimit (RLIMIT_SIGPENDING, &rlimit) == 0)
 | 
						|
	return rlimit.rlim_cur;
 | 
						|
 | 
						|
      /* The /proc/sys/kernel/rtsig-max file contains the answer.  */
 | 
						|
      procfname = "/proc/sys/kernel/rtsig-max";
 | 
						|
      break;
 | 
						|
 | 
						|
    default:
 | 
						|
      break;
 | 
						|
    }
 | 
						|
 | 
						|
  if (procfname != NULL)
 | 
						|
    {
 | 
						|
      int fd = __open_nocancel (procfname, O_RDONLY);
 | 
						|
      if (fd != -1)
 | 
						|
	{
 | 
						|
	  /* This is more than enough, the file contains a single integer.  */
 | 
						|
	  char buf[32];
 | 
						|
	  ssize_t n;
 | 
						|
	  n = TEMP_FAILURE_RETRY (__read_nocancel (fd, buf, sizeof (buf) - 1));
 | 
						|
	  __close_nocancel_nostatus (fd);
 | 
						|
 | 
						|
	  if (n > 0)
 | 
						|
	    {
 | 
						|
	      /* Terminate the string.  */
 | 
						|
	      buf[n] = '\0';
 | 
						|
 | 
						|
	      char *endp;
 | 
						|
	      long int res = strtol (buf, &endp, 10);
 | 
						|
	      if (endp != buf && (*endp == '\0' || *endp == '\n'))
 | 
						|
		return res;
 | 
						|
	    }
 | 
						|
	}
 | 
						|
    }
 | 
						|
 | 
						|
  return posix_sysconf (name);
 | 
						|
}
 | 
						|
 | 
						|
/* Now the POSIX version.  */
 | 
						|
#undef __sysconf
 | 
						|
#define __sysconf static posix_sysconf
 | 
						|
#include <sysdeps/posix/sysconf.c>
 |