diff mbox series

[v1.1] realpath: Bring back GNU extension on ENOENT and EACCES [BZ #28996]

Message ID 20220330043502.74482-1-siddhesh@sourceware.org
State Committed
Commit b416555431b47a21a855f225c6f5368ae4e4d56c
Headers
Series [v1.1] realpath: Bring back GNU extension on ENOENT and EACCES [BZ #28996] |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Siddhesh Poyarekar March 30, 2022, 4:35 a.m. UTC 
  The GNU extension for realpath states that if the path resolution fails
with ENOENT or EACCES and the resolved buffer is non-NULL, it will
contain part of the path that failed resolution.

commit 949ad78a189194048df8a253bb31d1d11d919044 broke this when it
omitted the copy on failure.  Bring it back partially to continue
supporting this GNU extension.

Resolves: BZ #28996

Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
---
 stdlib/canonicalize.c | 9 ++++++---
 stdlib/test-canon.c   | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

Comments

Andreas Schwab March 31, 2022, 2:44 p.m. UTC | #1 
On Mär 30 2022, Siddhesh Poyarekar via Libc-alpha wrote:

> The GNU extension for realpath states that if the path resolution fails
> with ENOENT or EACCES and the resolved buffer is non-NULL, it will
> contain part of the path that failed resolution.
>
> commit 949ad78a189194048df8a253bb31d1d11d919044 broke this when it
> omitted the copy on failure.  Bring it back partially to continue
> supporting this GNU extension.

Ok.
diff mbox series

Patch

diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c
index 6237a41d42..e6566bd7d9 100644
--- a/stdlib/canonicalize.c
+++ b/stdlib/canonicalize.c
@@ -400,11 +400,14 @@  realpath_stk (const char *name, char *resolved,
 
 error:
   *dest++ = '\0';
-  if (!failed && resolved != NULL)
+  if (resolved != NULL)
     {
-      if (dest - rname <= get_path_max ())
+      /* Copy the full result on success or partial result if failure was due
+	 to the path not existing or not being accessible.  */
+      if ((!failed || errno == ENOENT || errno == EACCES)
+	  && dest - rname <= get_path_max ())
 	rname = strcpy (resolved, rname);
-      else
+      else if (!failed)
 	{
 	  failed = true;
 	  __set_errno (ENAMETOOLONG);
diff --git a/stdlib/test-canon.c b/stdlib/test-canon.c
index 2ad1218749..a9c83be17c 100644
--- a/stdlib/test-canon.c
+++ b/stdlib/test-canon.c
@@ -174,8 +174,8 @@  do_test (int argc, char ** argv)
 	  continue;
 	}
 
-      /* Only on success verify that buf contains the result too.  */
-      if (result != NULL
+      /* Verify buf contents if the call succeeded or failed with ENOENT.  */
+      if ((result != NULL || errno == ENOENT)
 	  && !check_path (buf, tests[i].out ? tests[i].out : tests[i].resolved))
 	{
 	  printf ("%s: flunked test %d (expected resolved `%s', got `%s')\n",