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

Timestamp:

2011-04-27T20:01:13Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a6dffb8

Parents:

628d548 (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) (3 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)
@@ -722 +723 @@
                     (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);
@@ -732 +733 @@
                     (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) ?