comments

Author: thesayyn

private/util/validate_usr_symlinks.awk

@@ -2,24 +2,29 @@ BEGIN {
     # Mapping from root-level path to expected symlink destination.
     # https://github.com/floppym/merge-usr/blob/15dd02207bdee7ca6720d7024e8c0ffdc166ed23/merge-usr#L17-L25
     # Note: Debian does NOT merge /usr/sbin into /usr/bin, so /sbin -> usr/sbin.
-    expected["./bin"]    = "usr/bin"
-    expected["./sbin"]   = "usr/sbin"
-    expected["./lib"]    = "usr/lib"
-    expected["./lib32"]  = "usr/lib32"
-    expected["./lib64"]  = "usr/lib64"
-    expected["./libx32"] = "usr/libx32"
-    prefixes = "./bin|./sbin|./lib|./lib32|./lib64|./libx32"
+    expected["bin"]    = "usr/bin"
+    expected["sbin"]   = "usr/sbin"
+    expected["lib"]    = "usr/lib"
+    expected["lib32"]  = "usr/lib32"
+    expected["lib64"]  = "usr/lib64"
+    expected["libx32"] = "usr/libx32"
+    prefixes = "bin|sbin|lib|lib32|lib64|libx32"
 }
 {
-    path = $1
+    original_path = $1
+    path = original_path
+    # Normalize: strip leading ./ or /
+    sub(/^\.\//, "", path)
+    sub(/^\//, "", path)
+
     if (path in expected) {
         if ($0 !~ /type=link/) {
-            VIOLATIONS[path] = path " is not a symlink (must link to " expected[path] ")"
+            VIOLATIONS[original_path] = original_path " is not a symlink (must link to " expected[path] ")"
         } else if (match($0, / link=([^ \t]+)/, dest) && dest[1] != expected[path]) {
-            VIOLATIONS[path] = path " symlinks to '" dest[1] "' instead of '" expected[path] "'"
+            VIOLATIONS[original_path] = original_path " symlinks to '" dest[1] "' instead of '" expected[path] "'"
         }
-    } else if ($0 ~ ("^(" prefixes ")/")) {
-        VIOLATIONS[path] = path " found under a merged-usr symlink path (should not exist)"
+    } else if (path ~ ("^(" prefixes ")/")) {
+        VIOLATIONS[original_path] = original_path " found under a merged-usr symlink path (should not exist)"
     }
 }
 END {

private/util/validate_usr_symlinks_test.sh

@@ -21,6 +21,12 @@ fail() { echo "FAIL: $*" >&2; exit 1; }
 run "./bin type=link mode=0777 nlink=1 uid=0 gid=0 link=usr/bin" \
   || fail "./bin -> usr/bin should pass"
 
+run "/bin type=link mode=0777 nlink=1 uid=0 gid=0 link=usr/bin" \
+  || fail "/bin -> usr/bin should pass"
+
+run "bin type=link mode=0777 nlink=1 uid=0 gid=0 link=usr/bin" \
+  || fail "bin -> usr/bin should pass"
+
 run "./sbin type=link mode=0777 nlink=1 uid=0 gid=0 link=usr/sbin" \
   || fail "./sbin -> usr/sbin should pass"
 
@@ -45,12 +51,24 @@ run "./bin type=dir mode=0755 nlink=2 uid=0 gid=0" \
 run "./bin type=link mode=0777 nlink=1 uid=0 gid=0 link=usr/sbin" \
   && fail "./bin -> usr/sbin should fail" || true
 
+run "bin type=link mode=0777 nlink=1 uid=0 gid=0 link=usr/fin" \
+  && fail "bin -> usr/fin should fail" || true
+
+run "/bin type=link mode=0777 nlink=1 uid=0 gid=0 link=usr/fin" \
+  && fail "/bin -> usr/fin should fail" || true
+
 run "./sbin type=link mode=0777 nlink=1 uid=0 gid=0 link=usr/bin" \
   && fail "./sbin -> usr/bin should fail (Debian keeps sbin separate)" || true
 
 run "./lib/libfoo.so.1 type=file mode=0644 nlink=1 uid=0 gid=0 size=4096" \
   && fail "content under ./lib/ should fail" || true
 
+run "lib/libfoo.so.1 type=file mode=0644 nlink=1 uid=0 gid=0 size=4096" \
+  && fail "content under lib/ should fail" || true
+
+run "/lib/libfoo.so.1 type=file mode=0644 nlink=1 uid=0 gid=0 size=4096" \
+  && fail "content under /lib/ should fail" || true
+
 run "./bin/ls type=file mode=0755 nlink=1 uid=0 gid=0 size=12345" \
   && fail "content under ./bin/ should fail" || true