From b763cef4b8957d8140800d46391150599ef56c55 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 25 Nov 2019 19:09:53 +0800 Subject: pseudo: Make realpath() remove trailing slashes Linux system's realpath() remove trailing slashes, but pseudo's doesn't, need make them identical. E.g., the following code (rel.c) prints '/tmp' with system's realpath, but pseudo's realpath prints '/tmp/': #include #include #include int main() { char out[PATH_MAX]; printf("%s\n", realpath("/tmp/", out)); return 0; } $ bitbake base-passwd -cdevshell # For pseudo env $ gcc rel.c $ ./a.out /tmp/ (but should be /tmp) This patch fixes the problem. Signed-off-by: Robert Yang --- .../0001-realpath.c-Remove-trailing-slashes.patch | 57 ++++++++++++++++++++++ meta/recipes-devtools/pseudo/pseudo_git.bb | 1 + 2 files changed, 58 insertions(+) create mode 100644 meta/recipes-devtools/pseudo/files/0001-realpath.c-Remove-trailing-slashes.patch diff --git a/meta/recipes-devtools/pseudo/files/0001-realpath.c-Remove-trailing-slashes.patch b/meta/recipes-devtools/pseudo/files/0001-realpath.c-Remove-trailing-slashes.patch new file mode 100644 index 0000000000..17829ef3ac --- /dev/null +++ b/meta/recipes-devtools/pseudo/files/0001-realpath.c-Remove-trailing-slashes.patch @@ -0,0 +1,57 @@ +From 86c9a5610e3333ad6aaadb1ac1e8b5a2c948d119 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Mon, 25 Nov 2019 18:46:45 +0800 +Subject: [PATCH] realpath.c: Remove trailing slashes + +Linux system's realpath() remove trailing slashes, but pseudo's doesn't, need +make them identical. + +E.g., the following code (rel.c) prints '/tmp' with system's realpath, but +pseudo's realpath prints '/tmp/': + + #include + #include + #include + + int main() { + char out[PATH_MAX]; + printf("%s\n", realpath("/tmp/", out)); + return 0; + } + +$ bitbake base-passwd -cdevshell # For pseudo env +$ gcc rel.c +$ ./a.out +/tmp/ (but should be /tmp) + +This patch fixes the problem. + +Upstream-Status: Submitted [https://lists.yoctoproject.org/g/poky/message/11879] + +Signed-off-by: Robert Yang +--- + ports/unix/guts/realpath.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/ports/unix/guts/realpath.c b/ports/unix/guts/realpath.c +--- a/ports/unix/guts/realpath.c ++++ b/ports/unix/guts/realpath.c +@@ -14,7 +14,14 @@ + errno = ENAMETOOLONG; + return NULL; + } +- if ((len = strlen(rname)) >= pseudo_sys_path_max()) { ++ len = strlen(rname); ++ char *ep = rname + len - 1; ++ while (ep > rname && *ep == '/') { ++ --len; ++ *(ep--) = '\0'; ++ } ++ ++ if (len >= pseudo_sys_path_max()) { + errno = ENAMETOOLONG; + return NULL; + } +-- +2.7.4 + diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 1f2df4a427..7c75293ef1 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -8,6 +8,7 @@ SRC_URI = "git://git.yoctoproject.org/pseudo \ file://toomanyfiles.patch \ file://0001-maketables-wrappers-use-Python-3.patch \ file://0001-Add-statx.patch \ + file://0001-realpath.c-Remove-trailing-slashes.patch \ " SRCREV = "060058bb29f70b244e685b3c704eb0641b736f73" -- cgit 1.2.3-korg