libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[DFS][romfs] fix the mkrom issue when file/dir size zero

This commit is contained in:
Bernard Xiong 2019-01-13 14:24:00 +08:00
parent 8f0d8658b7
commit bd7ebbf17b
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/dfs/filesystems/romfs/dfs_romfs.h
View File

@ -17,11 +17,11 @@
struct romfs_dirent struct romfs_dirent
{ {
rt_uint32_t type; /* dirent type */ rt_uint32_t type; /* dirent type */
const char *name; /* dirent name */ const char *name; /* dirent name */
const rt_uint8_t *data; /* file date ptr */ const rt_uint8_t *data; /* file date ptr */
rt_size_t size; /* file size */ rt_size_t size; /* file size */
}; };
int dfs_romfs_init(void); int dfs_romfs_init(void);

18
components/dfs/filesystems/romfs/mkromfs.py → tools/mkromfs.py
View File

@ -40,6 +40,10 @@ class File(object):
head = 'static const rt_uint8_t %s[] = {\n' % \ head = 'static const rt_uint8_t %s[] = {\n' % \
(prefix + self.c_name) (prefix + self.c_name)
tail = '\n};' tail = '\n};'
if self.entry_size == 0:
return ''
return head + ','.join(('0x%02x' % ord(i) for i in self._data)) + tail return head + ','.join(('0x%02x' % ord(i) for i in self._data)) + tail
@property @property
@ -118,23 +122,31 @@ class Folder(object):
It is recursive.''' It is recursive.'''
# make the current dirent # make the current dirent
# static is good. Only root dirent is global visible. # static is good. Only root dirent is global visible.
if self.entry_size == 0:
return ''
dhead = 'static const struct romfs_dirent %s[] = {\n' % (prefix + self.c_name) dhead = 'static const struct romfs_dirent %s[] = {\n' % (prefix + self.c_name)
dtail = '\n};' dtail = '\n};'
body_fmt = ' {{{type}, "{name}", (rt_uint8_t *){data}, sizeof({data})/sizeof({data}[0])}}' body_fmt = ' {{{type}, "{name}", (rt_uint8_t *){data}, sizeof({data})/sizeof({data}[0])}}'
body_fmt0= ' {{{type}, "{name}", RT_NULL, 0}}'
# prefix of children # prefix of children
cpf = prefix+self.c_name cpf = prefix+self.c_name
body_li = [] body_li = []
payload_li = [] payload_li = []
for c in self._children: for c in self._children:
entry_size = c.entry_size
if isinstance(c, File): if isinstance(c, File):
tp = 'ROMFS_DIRENT_FILE' tp = 'ROMFS_DIRENT_FILE'
elif isinstance(c, Folder): elif isinstance(c, Folder):
tp = 'ROMFS_DIRENT_DIR' tp = 'ROMFS_DIRENT_DIR'
else: else:
assert False, 'Unkown instance:%s' % str(c) assert False, 'Unkown instance:%s' % str(c)
body_li.append(body_fmt.format(type=tp, if entry_size == 0:
name=c.name, body_li.append(body_fmt0.format(type=tp, name = c.name))
data=cpf+c.c_name)) else:
body_li.append(body_fmt.format(type=tp,
name=c.name,
data=cpf+c.c_name))
payload_li.append(c.c_data(prefix=cpf)) payload_li.append(c.c_data(prefix=cpf))
# All the data we need is defined in payload so we should append the # All the data we need is defined in payload so we should append the