🐛 minix 文件名匹配

Author: StevenBaby

src/fs/minix/minix.c

@@ -509,7 +509,7 @@ int minix_readdir(inode_t *inode, dentry_t *entry, size_t count, off_t offset)
         return ret;
 
     entry->length = sizeof(mentry);
-    entry->namelen = strnlen(mentry.name, NAME_LEN);
+    entry->namelen = strnlen(mentry.name, MINIX1_NAME_LEN);
     memcpy(entry->name, mentry.name, entry->namelen + 1);
     entry->name[entry->namelen] = 0;
     entry->nr = mentry.nr;
@@ -615,7 +615,7 @@ static buffer_t *find_entry(inode_t *dir, const char *name, char **next, minix_d
             buf = bread(dir->dev, block, BLOCK_SIZE);
             entry = (minix_dentry_t *)buf->data;
         }
-        if (match_name(name, entry->name, next) && entry->nr)
+        if (match_name(name, entry->name, next, MINIX1_NAME_LEN) && entry->nr)
         {
             *result = entry;
             return buf;
@@ -638,7 +638,7 @@ static buffer_t *add_entry(inode_t *dir, const char *name, minix_dentry_t **resu
     }
 
     // name 中不能有分隔符
-    for (size_t i = 0; i < NAME_LEN && name[i]; i++)
+    for (size_t i = 0; i < MINIX1_NAME_LEN && name[i]; i++)
     {
         assert(!IS_SEPARATOR(name[i]));
     }
@@ -668,7 +668,7 @@ static buffer_t *add_entry(inode_t *dir, const char *name, minix_dentry_t **resu
         if (entry->nr)
             continue;
 
-        strncpy(entry->name, name, NAME_LEN);
+        strncpy(entry->name, name, MINIX1_NAME_LEN);
 
         buf->dirty = true;
         dir->mtime = minode->mtime = time();

src/fs/minix/minix.h

@@ -4,12 +4,12 @@
 #include <onix/fs.h>
 #include <onix/buffer.h>
 
-#define BLOCK_SIZE 1024 // 块大小
-#define SECTOR_SIZE 512 // 扇区大小
+#define BLOCK_SIZE 1024                       // 块大小
+#define SECTOR_SIZE 512                       // 扇区大小
 #define BLOCK_SECS (BLOCK_SIZE / SECTOR_SIZE) // 一块占 2 个扇区
 
 #define MINIX1_MAGIC 0x137F // 文件系统魔数
-#define NAME_LEN 14         // 文件名长度
+#define MINIX1_NAME_LEN 14  // 文件名长度
 
 #define BLOCK_BITS (BLOCK_SIZE * 8)                          // 块位图大小
 #define BLOCK_INODES (BLOCK_SIZE / sizeof(minix_inode_t))    // 块 inode 数量
@@ -25,7 +25,7 @@
 #define P_READ IROTH
 #define P_WRITE IWOTH
 
-#define ACC_MODE(x) ("\004\002\006\377"[(x)&O_ACCMODE])
+#define ACC_MODE(x) ("\004\002\006\377"[(x) & O_ACCMODE])
 
 typedef struct minix_super_t
 {
@@ -53,8 +53,8 @@ typedef struct minix_inode_t
 // 文件目录项结构
 typedef struct minix_dentry_t
 {
-    u16 nr;              // i 节点
-    char name[NAME_LEN]; // 文件名
+    u16 nr;                    // i 节点
+    char name[MINIX1_NAME_LEN]; // 文件名
 } minix_dentry_t;
 
 #endif

src/fs/namei.c

@@ -10,16 +10,18 @@
 #define LOGK(fmt, args...) DEBUGK(fmt, ##args)
 
 // 判断文件名是否相等
-bool match_name(const char *name, const char *entry_name, char **next)
+bool match_name(const char *name, const char *entry_name, char **next, int count)
 {
     char *lhs = (char *)name;
     char *rhs = (char *)entry_name;
-    while (*lhs == *rhs && *lhs != EOS && *rhs != EOS)
+
+    while (*lhs == *rhs && *lhs != EOS && *rhs != EOS && count--)
     {
         lhs++;
         rhs++;
     }
-    if (*rhs)
+
+    if (*rhs && count)
         return false;
     if (*lhs && !IS_SEPARATOR(*lhs))
         return false;
@@ -67,7 +69,7 @@ inode_t *named(char *pathname, char **next)
     while (true)
     {
         // 返回上一级目录且上一级目录是个挂载点
-        if (match_name(name, "..", next) && dir == dir->super->iroot)
+        if (match_name(name, "..", next, 3) && dir == dir->super->iroot)
         {
             super_t *super = dir->super;
             inode = super->imount;
@@ -113,7 +115,7 @@ inode_t *namei(char *pathname)
     inode_t *inode = NULL;
 
     // 返回上一级目录且上一级目录是个挂载点
-    if (match_name(name, "..", &next) && dir == dir->super->iroot)
+    if (match_name(name, "..", &next, 3) && dir == dir->super->iroot)
     {
         super_t *super = dir->super;
         inode = super->imount;

src/include/onix/fs.h

@@ -172,6 +172,6 @@ void put_file(file_t *file);
 #define P_READ IROTH
 #define P_WRITE IWOTH
 
-bool match_name(const char *name, const char *entry_name, char **next);
+bool match_name(const char *name, const char *entry_name, char **next, int count);
 
 #endif

src/kernel/memory.c

@@ -278,8 +278,9 @@ void mapping_init()
             page_entry_t *tentry = &pte[tidx];
             entry_init(tentry, index);
             tentry->user = USER_MEMORY; // 只能被内核访问
-            if(memory_map[index] == 0) free_pages--;
-            memory_map[index] = 1;      // 设置物理内存数组，该页被占用
+            if (memory_map[index] == 0)
+                free_pages--;
+            memory_map[index] = 1; // 设置物理内存数组，该页被占用
         }
     }