about summary refs log tree commit diff
path: root/io/ftw.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-07-03 15:00:26 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-08-18 16:30:05 -0300
commit0bb2fabcb3bcac064a3d89917c0736353cdac2f4 (patch)
treeae8fac95821c7a7953213dee8dea233d5eb5b2cb /io/ftw.c
parent65a086db91d4e06074b461b8e99efcebe1416a3f (diff)
downloadglibc-0bb2fabcb3bcac064a3d89917c0736353cdac2f4.tar.gz
glibc-0bb2fabcb3bcac064a3d89917c0736353cdac2f4.tar.xz
glibc-0bb2fabcb3bcac064a3d89917c0736353cdac2f4.zip
Consolidate non cancellable openat call
This patch consolidates all the non cancellable openat{64} calls to use
the __openat{64}_nocancel 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.

Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu.

	* sysdeps/generic/not-cancel.h (openat_not_cancel): Remove macro.
	(openat_not_cancel_3): Likewise.
	(openat64_not_cancel_3): Likewise).
	(openat_not_cancel_3): Likewise).
	* sysdeps/unix/sysv/linux/not-cancel.h (openat_not_cancel): Remove
	macro.
	(openat_not_cancel_3): Likewise.
	(openat64_not_cancel): Likewise.
	(openat64_not_cancel_3): Likewise.
	* sysdeps/unix/sysv/linux/openat.c (__openat_nocancel): New function.
	* sysdeps/unix/sysv/linux/openat64.c (__openat64_nocancel): Likewise.
	* io/ftw.c (open_dir_stream): Replace openat{64}_not_cancel{_3} with
	__open{64}_nocancel.
	* sysdeps/mach/hurd/opendir.c (__opendirat): Likewise.
	* sysdeps/posix/getcwd.c (__getcwd): Likewise.
	* sysdeps/posix/opendir.c (__opendirat): Likewise.
Diffstat (limited to 'io/ftw.c')
-rw-r--r--io/ftw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/io/ftw.c b/io/ftw.c
index 140a237746..f33fed327d 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -337,8 +337,8 @@ open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp)
 
       if (dfdp != NULL && *dfdp != -1)
 	{
-	  int fd = openat64_not_cancel_3 (*dfdp, data->dirbuf + data->ftw.base,
-					  O_RDONLY | O_DIRECTORY | O_NDELAY);
+	  int fd = __openat64_nocancel (*dfdp, data->dirbuf + data->ftw.base,
+					O_RDONLY | O_DIRECTORY | O_NDELAY);
 	  dirp->stream = NULL;
 	  if (fd != -1 && (dirp->stream = __fdopendir (fd)) == NULL)
 	    close_not_cancel_no_status (fd);