Changeset 14c331a in mainline

Timestamp:

2008-11-25T12:14:31Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

46321fb

Parents:

49df572

Message:

Consider "prd" and "prd." to be the same FAT dentry names.

Location:

uspace/srv/fs/fat

Files:

• fat_dentry.c (modified) (2 diffs)
• fat_dentry.h (modified) (1 diff)
• fat_ops.c (modified) (1 diff)

uspace/srv/fs/fat/fat_dentry.c

@@ -38 +38 @@
 #include "fat_dentry.h"
 #include <ctype.h>
+#include <string.h>
 
 #define FAT_PAD                 ' ' 
@@ -52 +53 @@
         else
                 return false;
+}
+
+/** Compare path component with the name read from the dentry.
+ *
+ * This function compares the path component with the name read from the dentry.
+ * The comparison is case insensitive and tolerates a mismatch on the trailing
+ * dot character at the end of the name (i.e. when there is a dot, but no
+ * extension).
+ *
+ * @param name          Node name read from the dentry.
+ * @param component     Path component.
+ *
+ * @return              Zero on match, non-zero otherwise.
+ */
+int fat_dentry_namecmp(char *name, const char *component)
+{
+        int rc;
+        if (!(rc = stricmp(name, component)))
+                return rc;
+        if (!strchr(name, '.')) {
+                /*
+                 * There is no '.' in the name, so we know that there is enough
+                 * space for appending an extra '.' to name.
+                 */
+                name[strlen(name)] = '.';
+                name[strlen(name) + 1] = '\0';
+                rc = stricmp(name, component);
+        }
+        return rc;
 }
 

uspace/srv/fs/fat/fat_dentry.h

@@ -73 +73 @@
 } __attribute__ ((packed)) fat_dentry_t;
 
+extern int fat_dentry_namecmp(char *, const char *);
 extern bool fat_dentry_name_verify(const char *);
 extern void fat_dentry_name_get(const fat_dentry_t *, char *);

uspace/srv/fs/fat/fat_ops.c

@@ -517 +517 @@
                                 break;
                         }
-                        if (stricmp(name, component) == 0) {
+                        if (fat_dentry_namecmp(name, component) == 0) {
                                 /* hit */
                                 void *node;