p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!500 liteos_a toybox 命令已知问题修复 

Merge pull request !500 from Kiita/toybox_update_0802
This commit is contained in:
openharmony_ci 2021-08-05 11:50:28 +00:00 committed by Gitee
parent d2fe0e788b c3245b3ce3
commit 3cc09763f2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/fat/os_adapt/fatfs.c
View File

@ -449,6 +449,8 @@ static int fatfs_create_obj(struct Vnode *parent, const char *name, int mode, st
dp_new->obj.objsize = 0; dp_new->obj.objsize = 0;
} else if (type == AM_LNK) { } else if (type == AM_LNK) {
dp_new->obj.objsize = strlen(target); dp_new->obj.objsize = strlen(target);
} else {
finfo_new->fsize = fs->csize * SS(fs);
} }
ret = VnodeAlloc(&fatfs_vops, &vp); ret = VnodeAlloc(&fatfs_vops, &vp);
@ -558,6 +560,7 @@ int fatfs_lookup(struct Vnode *parent, const char *path, int len, struct Vnode *
vp->mode = fatfs_get_mode(finfo->fattrib, fs->fs_mode); vp->mode = fatfs_get_mode(finfo->fattrib, fs->fs_mode);
if (finfo->fattrib & AM_DIR) { if (finfo->fattrib & AM_DIR) {
vp->type = VNODE_TYPE_DIR; vp->type = VNODE_TYPE_DIR;
finfo->fsize = fs->csize * SS(fs);
} else { } else {
vp->type = VNODE_TYPE_REG; vp->type = VNODE_TYPE_REG;
} }
@ -1182,6 +1185,7 @@ int fatfs_mount(struct Mount *mnt, struct Vnode *blk_device, const void *data)
dfp->fno.ftime = 0; dfp->fno.ftime = 0;
dfp->fno.fattrib = AM_DIR; dfp->fno.fattrib = AM_DIR;
dfp->fno.sclst = 0; dfp->fno.sclst = 0;
dfp->fno.fsize = fs->csize * SS(fs);
dfp->fno.fname[0] = '/'; /* Mark as root dir */ dfp->fno.fname[0] = '/'; /* Mark as root dir */
dfp->fno.fname[1] = '\0'; dfp->fno.fname[1] = '\0';
LOS_ListInit(&(dfp->fno.fp_list)); LOS_ListInit(&(dfp->fno.fp_list));
@ -1413,7 +1417,11 @@ int fatfs_stat(struct Vnode *vp, struct stat* sp)
sp->st_gid = fs->fs_gid; sp->st_gid = fs->fs_gid;
sp->st_size = finfo->fsize; sp->st_size = finfo->fsize;
sp->st_blksize = fs->csize * SS(fs); sp->st_blksize = fs->csize * SS(fs);
sp->st_blocks = finfo->fsize ? ((finfo->fsize - 1) / SS(fs) / fs->csize + 1) : 0; if (finfo->fattrib & AM_ARC) {
sp->st_blocks = finfo->fsize ? ((finfo->fsize - 1) / SS(fs) / fs->csize + 1) : 0;
} else {
sp->st_blocks = fs->csize;
}
time = fattime_transfer(finfo->fdate, finfo->ftime); time = fattime_transfer(finfo->fdate, finfo->ftime);
sp->st_mtime = time; sp->st_mtime = time;