From 5db0d046b65a464f9be3560ab4eb298cd30864a1 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 14 May 2025 14:52:41 +0000
Subject: 53607: Stop printing /usr/bin/foo -> /usr/bin/foo in 'whence -s'.

Makes the new test PASS.

Review-by: Bart Schaefer
---
 Src/utils.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'Src/utils.c')

diff --git a/Src/utils.c b/Src/utils.c
index 19fd61a8b..4ea7b8e93 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -1003,11 +1003,23 @@ print_if_link(char *s, int all)
 		}
 	    }
 	} else {
-	    if (chrealpath(&s, 'P', 0)) {
+#ifdef HAVE_MEMCCPY
+	    char s_at_entry[PATH_MAX+1];
+	    if (!memccpy(s_at_entry, s, '\0', sizeof(s_at_entry))) {
+		DPUTS1(1, "path longer than PATH_MAX: %s", s);
+		s_at_entry[PATH_MAX] = '\0';
+	    }
+#else /* HAVE_MEMCCPY */
+	    char *s_at_entry = ztrdup(s);
+#endif /* HAVE_MEMCCPY */
+	    if (chrealpath(&s, 'P', 0) && strcmp(s, s_at_entry)) {
 		printf(" -> ");
 		zputs(*s ? s : "/", stdout);
 		zsfree(s);
 	    }
+#ifndef HAVE_MEMCCPY
+	    zsfree(s_at_entry);
+#endif /* !HAVE_MEMCCPY */
 	}
     }
 }
-- 
cgit v1.2.3-70-g09d2