Changeset 033ef7d3 in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2008-10-26T13:09:24Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0f57d0e

Parents:

6ebaff9

Message:

Move functionality related to FAT dentries to fat_dentry.c.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (3 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -37 +37 @@
 
 #include "fat.h"
+#include "fat_dentry.h"
+#include "fat_fat.h"
 #include "../../vfs/vfs.h"
 #include <libfs.h>
@@ -62 +64 @@
 static LIST_INITIALIZE(ffn_head);
 
-#define FAT_NAME_LEN            8
-#define FAT_EXT_LEN             3
-
-#define FAT_PAD                 ' ' 
-
-#define FAT_DENTRY_UNUSED       0x00
-#define FAT_DENTRY_E5_ESC       0x05
-#define FAT_DENTRY_DOT          0x2e
-#define FAT_DENTRY_ERASED       0xe5
-
 #define min(a, b)               ((a) < (b) ? (a) : (b))
-
-static void dentry_name_canonify(fat_dentry_t *d, char *buf)
-{
-        int i;
-
-        for (i = 0; i < FAT_NAME_LEN; i++) {
-                if (d->name[i] == FAT_PAD)
-                        break;
-                if (d->name[i] == FAT_DENTRY_E5_ESC)
-                        *buf++ = 0xe5;
-                else
-                        *buf++ = d->name[i];
-        }
-        if (d->ext[0] != FAT_PAD)
-                *buf++ = '.';
-        for (i = 0; i < FAT_EXT_LEN; i++) {
-                if (d->ext[i] == FAT_PAD) {
-                        *buf = '\0';
-                        return;
-                }
-                if (d->ext[i] == FAT_DENTRY_E5_ESC)
-                        *buf++ = 0xe5;
-                else
-                        *buf++ = d->ext[i];
-        }
-        *buf = '\0';
-}
 
 static int dev_phone = -1;              /* FIXME */
@@ -298 +263 @@
 
         return bps;
-}
-
-typedef enum {
-        FAT_DENTRY_SKIP,
-        FAT_DENTRY_LAST,
-        FAT_DENTRY_VALID
-} fat_dentry_clsf_t;
-
-static fat_dentry_clsf_t fat_classify_dentry(fat_dentry_t *d)
-{
-        if (d->attr & FAT_ATTR_VOLLABEL) {
-                /* volume label entry */
-                return FAT_DENTRY_SKIP;
-        }
-        if (d->name[0] == FAT_DENTRY_ERASED) {
-                /* not-currently-used entry */
-                return FAT_DENTRY_SKIP;
-        }
-        if (d->name[0] == FAT_DENTRY_UNUSED) {
-                /* never used entry */
-                return FAT_DENTRY_LAST;
-        }
-        if (d->name[0] == FAT_DENTRY_DOT) {
-                /*
-                 * Most likely '.' or '..'.
-                 * It cannot occur in a regular file name.
-                 */
-                return FAT_DENTRY_SKIP;
-        }
-        return FAT_DENTRY_VALID;
 }