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


Ignore:
Timestamp:
2011-05-01T19:34:26Z (14 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0e26444
Parents:
1ff896e (diff), 042fbe0 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/fs/fat/fat_ops.c

    r1ff896e r694ca93f  
    5555#include <sys/mman.h>
    5656#include <align.h>
     57#include <malloc.h>
    5758
    5859#define FAT_NODE(node)  ((node) ? (fat_node_t *) (node)->data : NULL)
     
    722723                    (str_cmp((char *) d->name, FAT_NAME_DOT)) == 0) {
    723724                        memset(d, 0, sizeof(fat_dentry_t));
    724                         str_cpy((char *) d->name, 8, FAT_NAME_DOT);
    725                         str_cpy((char *) d->ext, 3, FAT_EXT_PAD);
     725                        memcpy(d->name, FAT_NAME_DOT, FAT_NAME_LEN);
     726                        memcpy(d->ext, FAT_EXT_PAD, FAT_EXT_LEN);
    726727                        d->attr = FAT_ATTR_SUBDIR;
    727728                        d->firstc = host2uint16_t_le(childp->firstc);
     
    732733                    (str_cmp((char *) d->name, FAT_NAME_DOT_DOT) == 0)) {
    733734                        memset(d, 0, sizeof(fat_dentry_t));
    734                         str_cpy((char *) d->name, 8, FAT_NAME_DOT_DOT);
    735                         str_cpy((char *) d->ext, 3, FAT_EXT_PAD);
     735                        memcpy(d->name, FAT_NAME_DOT_DOT, FAT_NAME_LEN);
     736                        memcpy(d->ext, FAT_EXT_PAD, FAT_EXT_LEN);
    736737                        d->attr = FAT_ATTR_SUBDIR;
    737738                        d->firstc = (parentp->firstc == FAT_CLST_ROOT) ?
Note: See TracChangeset for help on using the changeset viewer.