Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 86c9a5610e3333ad6aaadb1ac1e8b5a2c948d119 Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Mon, 25 Nov 2019 18:46:45 +0800 |
| 4 | Subject: [PATCH] realpath.c: Remove trailing slashes |
| 5 | |
| 6 | Linux system's realpath() remove trailing slashes, but pseudo's doesn't, need |
| 7 | make them identical. |
| 8 | |
| 9 | E.g., the following code (rel.c) prints '/tmp' with system's realpath, but |
| 10 | pseudo's realpath prints '/tmp/': |
| 11 | |
| 12 | #include <stdio.h> |
| 13 | #include <limits.h> |
| 14 | #include <stdlib.h> |
| 15 | |
| 16 | int main() { |
| 17 | char out[PATH_MAX]; |
| 18 | printf("%s\n", realpath("/tmp/", out)); |
| 19 | return 0; |
| 20 | } |
| 21 | |
| 22 | $ bitbake base-passwd -cdevshell # For pseudo env |
| 23 | $ gcc rel.c |
| 24 | $ ./a.out |
| 25 | /tmp/ (but should be /tmp) |
| 26 | |
| 27 | This patch fixes the problem. |
| 28 | |
| 29 | Upstream-Status: Submitted [https://lists.yoctoproject.org/g/poky/message/11879] |
| 30 | |
| 31 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 32 | --- |
| 33 | ports/unix/guts/realpath.c | 9 ++++++++- |
| 34 | 1 file changed, 8 insertions(+), 1 deletion(-) |
| 35 | |
| 36 | diff --git a/ports/unix/guts/realpath.c b/ports/unix/guts/realpath.c |
| 37 | --- a/ports/unix/guts/realpath.c |
| 38 | +++ b/ports/unix/guts/realpath.c |
| 39 | @@ -14,7 +14,14 @@ |
| 40 | errno = ENAMETOOLONG; |
| 41 | return NULL; |
| 42 | } |
| 43 | - if ((len = strlen(rname)) >= pseudo_sys_path_max()) { |
| 44 | + len = strlen(rname); |
| 45 | + char *ep = rname + len - 1; |
| 46 | + while (ep > rname && *ep == '/') { |
| 47 | + --len; |
| 48 | + *(ep--) = '\0'; |
| 49 | + } |
| 50 | + |
| 51 | + if (len >= pseudo_sys_path_max()) { |
| 52 | errno = ENAMETOOLONG; |
| 53 | return NULL; |
| 54 | } |
| 55 | -- |
| 56 | 2.7.4 |
| 57 | |