Changeset 63bcbbc in mainline

Timestamp:

2011-12-12T20:23:53Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1df224c

Parents:

bf84871 (diff), 80ec9b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:exfat-helenos.

Location:

uspace/srv/fs/exfat

Files:

• exfat_bitmap.c (modified) (1 diff)
• exfat_dentry.c (modified) (1 diff)
• exfat_directory.c (modified) (5 diffs)
• exfat_fat.c (modified) (5 diffs)
• exfat_ops.c (modified) (6 diffs)

uspace/srv/fs/exfat/exfat_bitmap.c

@@ -45 +45 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <malloc.h>
 #include <mem.h>
 

uspace/srv/fs/exfat/exfat_dentry.c

@@ -101 +101 @@
 bool exfat_valid_char(wchar_t ch)
 {
-        /* TODO */
-        return true;
+        switch (ch) {
+        case 0x01 ... 0x1F:
+        case '/':
+        case '\\':
+        case '?':
+        case '|':
+        case '>':
+        case '<':
+        case '"':
+        case '*':
+        case ':':
+                return false;
+        default:
+                return true;
+        }
 }
 
 bool exfat_valid_name(const char *name)
 {
-        /* TODO */
+        size_t off = 0;
+        wchar_t ch;
+
+        while ((ch = str_decode(name, &off, STR_NO_LIMIT)) != 0) {
+                if (!exfat_valid_char(ch))
+                        return false;
+        }
         return true;
 }

uspace/srv/fs/exfat/exfat_directory.c

@@ -112 +112 @@
                 rc = block_put(di->b);
                 di->b = NULL;
+                if (rc != EOK)
+                        return rc;
         }
         if (!di->b) {
@@ -266 +268 @@
                 if (idx == 2 || idx == 3)
                         continue;
-                checksum = ((checksum << 15) | (checksum >> 1)) + (uint16_t)bytes[idx];
+                checksum = ((checksum << 15) | (checksum >> 1)) +
+                    (uint16_t)bytes[idx];
         }
         return checksum;
@@ -310 +313 @@
         array[1].stream.valid_data_size = host2uint64_t_le(ds->valid_data_size);
         array[1].stream.data_size = host2uint64_t_le(ds->data_size);
-        array[0].file.checksum = host2uint16_t_le(exfat_directory_set_checksum((uint8_t *)array,
+        array[0].file.checksum =
+            host2uint16_t_le(exfat_directory_set_checksum((uint8_t *)array,
             count * sizeof(exfat_dentry_t)));
 
@@ -352 +356 @@
         uctablep = EXFAT_NODE(fn);
 
-        uctable_chars = ALIGN_DOWN(uctablep->size, sizeof(uint16_t)) / sizeof(uint16_t); 
+        uctable_chars = ALIGN_DOWN(uctablep->size,
+            sizeof(uint16_t)) / sizeof(uint16_t); 
         uctable = (uint16_t *) malloc(uctable_chars * sizeof(uint16_t));
         rc = exfat_read_uctable(di->bs, uctablep, (uint8_t *)uctable);
@@ -417 +422 @@
                         return rc;
 
-                if (i == df.file.count - 2)
-                        chars = ds.stream.name_size - EXFAT_NAME_PART_LEN*(df.file.count - 2);
+                if (i == df.file.count - 2) {
+                        chars = ds.stream.name_size -
+                            EXFAT_NAME_PART_LEN*(df.file.count - 2);
+                }
+
                 rc = exfat_directory_get(di, &de);
                 if (rc != EOK)

uspace/srv/fs/exfat/exfat_fat.c

@@ -50 +50 @@
 #include <malloc.h>
 #include <mem.h>
+#include <str.h>
 
 
@@ -322 +323 @@
                             (found == 0) ?  EXFAT_CLST_EOF : lifo[found - 1]);
                         if (rc != EOK)
-                                break;
+                                goto exit_error;
                         found++;
                         rc = bitmap_set_cluster(bs, service_id, clst);
                         if (rc != EOK)
-                                break;
+                                goto exit_error;
 
                 }
@@ -339 +340 @@
         }
 
+        rc = ENOSPC;
+
+exit_error:
+
         /* If something wrong - free the clusters */
         while (found--) {
@@ -347 +352 @@
         free(lifo);
         fibril_mutex_unlock(&exfat_alloc_lock);
-        return ENOSPC;
+        return rc;
 }
 
@@ -537 +542 @@
 int exfat_sanity_check(exfat_bs_t *bs, service_id_t service_id)
 {
-        /* TODO */
+        if (str_cmp((char const *)bs->oem_name, "EXFAT   "))
+                return ENOTSUP;
+        else if (uint16_t_le2host(bs->signature) != 0xAA55)
+                return ENOTSUP;
+        else if (uint32_t_le2host(bs->fat_sector_count) == 0)
+                return ENOTSUP;
+        else if (uint32_t_le2host(bs->data_clusters) == 0)
+                return ENOTSUP;
+        else if (bs->fat_count != 1)
+                return ENOTSUP;
+        else if ((bs->bytes_per_sector + bs->sec_per_cluster) > 25) {
+                /* exFAT does not support cluster size > 32 Mb */
+                return ENOTSUP;
+        }
         return EOK;
 }

uspace/srv/fs/exfat/exfat_ops.c

@@ -657 +657 @@
                         return rc;
                 }
+
+                rc = exfat_zero_cluster(bs, service_id, nodep->firstc);
+                if (rc != EOK) {
+                        (void) exfat_node_put(FS_NODE(nodep));
+                        return rc;
+                }
+
                 nodep->size = BPC(bs);
         } else {
@@ -739 +746 @@
          */
         rc = exfat_directory_write_file(&di, name);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                (void) exfat_directory_close(&di);
+                fibril_mutex_unlock(&parentp->idx->lock);
+                return rc;
+        }
         rc = exfat_directory_close(&di);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                fibril_mutex_unlock(&parentp->idx->lock);
+                return rc;
+        }
 
         fibril_mutex_unlock(&parentp->idx->lock);
@@ -1258 +1270 @@
                 exfat_directory_t di;
                 rc = exfat_directory_open(nodep, &di);
-                if (rc != EOK) goto err;
+                if (rc != EOK)
+                        goto err;
+
                 rc = exfat_directory_seek(&di, pos);
                 if (rc != EOK) {
@@ -1268 +1282 @@
                     &df, &ds);
                 if (rc == EOK)
-                    goto hit;
-                if (rc == ENOENT)
-                    goto miss;
+                        goto hit;
+                else if (rc == ENOENT)
+                        goto miss;
+
+                (void) exfat_directory_close(&di);
 
 err:
@@ -1279 +1295 @@
 miss:
                 rc = exfat_directory_close(&di);
-                if (rc!=EOK)
+                if (rc != EOK)
                         goto err;
                 rc = exfat_node_put(fn);
@@ -1397 +1413 @@
 
         (void) async_data_write_finalize(callid,
-                b->data + pos % BPS(bs), bytes);
+            b->data + pos % BPS(bs), bytes);
         b->dirty = true;                /* need to sync block */
         rc = block_put(b);