Changeset 3dbe4ca2 in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2011-04-29T11:10:24Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

ce8f4f4

Parents:

d260a95 (diff), 933cadf (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 mainline changes.

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -55 +55 @@
 #include <sys/mman.h>
 #include <align.h>
+#include <malloc.h>
 
 #define FAT_NODE(node)  ((node) ? (fat_node_t *) (node)->data : NULL)
@@ -724 +725 @@
                     (str_cmp((char *) d->name, FAT_NAME_DOT)) == 0) {
                         memset(d, 0, sizeof(fat_dentry_t));
-                        str_cpy((char *) d->name, 8, FAT_NAME_DOT);
-                        str_cpy((char *) d->ext, 3, FAT_EXT_PAD);
+                        memcpy(d->name, FAT_NAME_DOT, FAT_NAME_LEN);
+                        memcpy(d->ext, FAT_EXT_PAD, FAT_EXT_LEN);
                         d->attr = FAT_ATTR_SUBDIR;
                         d->firstc = host2uint16_t_le(childp->firstc);
@@ -734 +735 @@
                     (str_cmp((char *) d->name, FAT_NAME_DOT_DOT) == 0)) {
                         memset(d, 0, sizeof(fat_dentry_t));
-                        str_cpy((char *) d->name, 8, FAT_NAME_DOT_DOT);
-                        str_cpy((char *) d->ext, 3, FAT_EXT_PAD);
+                        memcpy(d->name, FAT_NAME_DOT_DOT, FAT_NAME_LEN);
+                        memcpy(d->ext, FAT_EXT_PAD, FAT_EXT_LEN);
                         d->attr = FAT_ATTR_SUBDIR;
                         d->firstc = (parentp->firstc == FAT_CLST_ROOT) ?
@@ -1002 +1003 @@
         }
 
-        /* Determining type of FAT  */
-        if (FAT_IS_FAT12(bs)) {
-                printf("Found FAT12 filesystem\n");
-        } else if (FAT_IS_FAT16(bs)) {
-                printf("Found FAT16 filesystem\n");
-        } else {
-                printf("FAT32 filesystem is not supported by FAT server.\n");
+        /* Return NOT SUPPORTED if try to mount FAT32  */
+        if (!FAT_IS_FAT12(bs) && !FAT_IS_FAT16(bs)) {
                 block_fini(devmap_handle);
                 async_answer_0(rid, ENOTSUP);
@@ -1017 +1013 @@
         rc = fat_sanity_check(bs, devmap_handle);
         if (rc != EOK) {
-                printf("Sanity check failed\n");
                 (void) block_cache_fini(devmap_handle);
                 block_fini(devmap_handle);