From 590ba7e5d0a8c31e5d420139d718654bcb25bc83 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Tue, 26 Jun 2018 06:26:14 +0200 Subject: [PATCH] open_by_handle_at.2, ctermid.3, getcwd.3, proc.5: Wording fix: prefer "pathname" over "path" --- man2/open_by_handle_at.2 | 4 ++-- man3/ctermid.3 | 2 +- man3/getcwd.3 | 14 +++++++------- man5/proc.5 | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/man2/open_by_handle_at.2 b/man2/open_by_handle_at.2 index c4d7ba53a..877e7bea4 100644 --- a/man2/open_by_handle_at.2 +++ b/man2/open_by_handle_at.2 @@ -223,7 +223,7 @@ is dereferenced if it is a symbolic link (so that the call returns a handle for the file referred to by the link). .PP .BR name_to_handle_at () -does not trigger a mount when the final component of the path is an +does not trigger a mount when the final component of the pathname is an automount point. When a filesystem supports both file handles and automount points, a @@ -237,7 +237,7 @@ This can happen since Linux 4.13 with NFS when accessing a directory which is on a separate filesystem on the server. In this case, the automount can be triggered by adding a "/" to the end -of the path. +of the pathname. .SS open_by_handle_at() The .BR open_by_handle_at () diff --git a/man3/ctermid.3 b/man3/ctermid.3 index 958504225..e38319991 100644 --- a/man3/ctermid.3 +++ b/man3/ctermid.3 @@ -72,7 +72,7 @@ T} Thread safety MT-Safe .SH CONFORMING TO POSIX.1-2001, POSIX.1-2008, Svr4. .SH BUGS -The path returned may not uniquely identify the controlling +The returned pathname may not uniquely identify the controlling terminal; it may, for example, be .IR /dev/tty . .PP diff --git a/man3/getcwd.3 b/man3/getcwd.3 index 0f048d353..c8a691b4a 100644 --- a/man3/getcwd.3 +++ b/man3/getcwd.3 @@ -288,7 +288,7 @@ a (slower) alternative implementation that returns the full pathname. .PP Following a change in Linux 2.6.36, .\" commit 8df9d1a4142311c084ffeeacb67cd34d190eff74 -the path returned by the +the pathname returned by the .BR getcwd () system call will be prefixed with the string "(unreachable)" if the current directory is not below the root directory of the current @@ -297,21 +297,21 @@ process (e.g., because the process set a new filesystem root using without changing its current directory into the new root). Such behavior can also be caused by an unprivileged user by changing the current directory into another mount namespace. -When dealing with paths from untrusted sources, callers of the +When dealing with pathname from untrusted sources, callers of the functions described in this page -should consider checking whether the returned path starts +should consider checking whether the returned pathname starts with '/' or '(' to avoid misinterpreting an unreachable path -as a relative path. +as a relative pathname. .SH BUGS Since the Linux 2.6.36 change that added "(unreachable)" in the circumstances described above, the glibc implementation of .BR getcwd () -has failed to conform to POSIX and returned a relative path when the API -contract requires an absolute path. +has failed to conform to POSIX and returned a relative pathname when the API +contract requires an absolute pathname. With glibc 2.27 onwards this is corrected; calling .BR getcwd () -from such a path will now result in failure with +from such a pathname will now result in failure with .BR ENOENT . .SH SEE ALSO .BR pwd (1), diff --git a/man5/proc.5 b/man5/proc.5 index 119be21a8..d8350a408 100644 --- a/man5/proc.5 +++ b/man5/proc.5 @@ -3726,7 +3726,7 @@ sockets, it is 0005. the internal state of the socket. .TP .IR Path : -the bound path (if any) of the socket. +the bound pathname (if any) of the socket. Sockets in the abstract namespace are included in the list, and are shown with a .I Path @@ -4598,7 +4598,7 @@ man page. .TP .I /proc/sys/kernel/hotplug This file -contains the path for the hotplug policy agent. +contains the pathname for the hotplug policy agent. The default value in this file is .IR /sbin/hotplug . .TP @@ -4651,7 +4651,7 @@ If 0, the cache is disabled. Enabled if nonzero. .TP .I /proc/sys/kernel/modprobe -This file contains the path for the kernel module loader. +This file contains the pathname for the kernel module loader. The default value is .IR /sbin/modprobe . The file is present only if the kernel is built with the