Fix multiple rpath tccmacho

If multiple rpaths are specified then output multiple LC_RPATH load commands instead of one with : seperator.

herman ten brugge committed 3 years ago

Commit 3fd6a051 parent 03841b61 file · +13 −5Browse files

Unified · Split

     }
     if (s1->rpath) {
-        i = (sizeof(*rpath) + strlen(s1->rpath) + 1 + 7) &-8;
+	char *path = s1->rpath, *end;
-        rpath = add_lc(mo, LC_RPATH, i);
+	do {
-        rpath->path = sizeof(*rpath);
+	    end = strchr(path, ':');
-        str = (char*)rpath + rpath->path;
+	    if (!end)
-        strcpy(str, s1->rpath);
+		end = strchr(path, 0);
+            i = (sizeof(*rpath) + (end - path) + 1 + 7) &-8;
+            rpath = add_lc(mo, LC_RPATH, i);
+            rpath->path = sizeof(*rpath);
+            str = (char*)rpath + rpath->path;
+            memcpy(str, path, end - path);
+	    str[end - path] = 0;
+	    path = end + 1;
+	} while (*end);
     }
     fileofs = 4096;  /* leave space for mach-o headers */

Keyboard shortcuts