void-packages/srcpkgs/bubblewrap/patches/realpath-workaround.patch

47 lines
1.2 KiB
Diff

add normpath(), originally written for xbps.
diff --git bind-mount.c.orig bind-mount.c
index 045fa0e..d05b540 100644
--- bind-mount.c.orig
+++ bind-mount.c
@@ -23,6 +23,28 @@
#include "utils.h"
#include "bind-mount.h"
+#ifndef __GLIBC__
+static char *
+normpath(char *path)
+{
+ char *seg = NULL, *p = NULL;
+
+ for (p = path, seg = NULL; *p; p++) {
+ if (strncmp(p, "/../", 4) == 0 || strncmp(p, "/..", 4) == 0) {
+ memmove(seg ? seg : p, p+3, strlen(p+3) + 1);
+ return normpath(path);
+ } else if (strncmp(p, "/./", 3) == 0 || strncmp(p, "/.", 3) == 0) {
+ memmove(p, p+2, strlen(p+2) + 1);
+ } else if (strncmp(p, "//", 2) == 0 || strncmp(p, "/", 2) == 0) {
+ memmove(p, p+1, strlen(p+1) + 1);
+ }
+ if (*p == '/')
+ seg = p;
+ }
+ return path;
+}
+#endif
+
static char *
skip_token (char *line, bool eat_whitespace)
{
@@ -397,7 +419,11 @@ bind_mount (int proc_fd,
path, so to find it in the mount table we need to do that too. */
resolved_dest = realpath (dest, NULL);
if (resolved_dest == NULL)
+#ifdef __GLIBC__
return 2;
+#else
+ resolved_dest = normpath(strdup(dest));
+#endif
mount_tab = parse_mountinfo (proc_fd, resolved_dest);
if (mount_tab[0].mountpoint == NULL)