fix cpio reader

teplofizik · Oct 12, 2022 · 5db79c6 · 5db79c6
1 parent 30c2d83
commit 5db79c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/NyaFs/Filesystem/Cpio/CpioFsBuilder.cs b/NyaFs/Filesystem/Cpio/CpioFsBuilder.cs
@@ -2,6 +2,7 @@
 using NyaFs.Filesystem.Universal;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Text;
 
 namespace NyaFs.Filesystem.Cpio

diff --git a/NyaFs/Filesystem/Cpio/CpioFsReader.cs b/NyaFs/Filesystem/Cpio/CpioFsReader.cs
@@ -80,7 +80,7 @@ public string ReadLink(string Path)
             {
                 if (UnifyPath(N.Path) == UnifyPath(Path))
                 {
-                    if (N.FileType == Types.CpioModeFileType.C_ISREG)
+                    if (N.FileType == Types.CpioModeFileType.C_ISLNK)
                         return UTF8Encoding.UTF8.GetString(N.Content);
                     else
                         return null;
@@ -124,6 +124,8 @@ public FilesystemEntry[] ReadDir(string Path)
                     Pos = Pos + Path.Length + 1;
                     if((Pos < UPath.Length) && UPath.IndexOf('/', Pos) < 0)
                     {
+                        if ((Path.Length > 0) && UPath[Path.Length] != '/') continue;
+
                         Res.Add(new FilesystemEntry(N.FsType, UPath, N.UserId, N.GroupId, N.HexMode, Convert.ToUInt32(N.Content.Length)));
                     }
                 }