mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
hfsplus: add support of manipulation by attributes file
Add support of manipulation by attributes file. Signed-off-by: Vyacheslav Dubeyko <slava@dubeyko.com> Reported-by: Hin-Tak Leung <htl10@users.sourceforge.net> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Christoph Hellwig <hch@lst.de> Cc: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
127e5f5ae5
commit
324ef39a8a
13 changed files with 287 additions and 183 deletions
|
@ -295,7 +295,8 @@ static inline u16 *decompose_unichar(wchar_t uc, int *size)
|
|||
return hfsplus_decompose_table + (off / 4);
|
||||
}
|
||||
|
||||
int hfsplus_asc2uni(struct super_block *sb, struct hfsplus_unistr *ustr,
|
||||
int hfsplus_asc2uni(struct super_block *sb,
|
||||
struct hfsplus_unistr *ustr, int max_unistr_len,
|
||||
const char *astr, int len)
|
||||
{
|
||||
int size, dsize, decompose;
|
||||
|
@ -303,7 +304,7 @@ int hfsplus_asc2uni(struct super_block *sb, struct hfsplus_unistr *ustr,
|
|||
wchar_t c;
|
||||
|
||||
decompose = !test_bit(HFSPLUS_SB_NODECOMPOSE, &HFSPLUS_SB(sb)->flags);
|
||||
while (outlen < HFSPLUS_MAX_STRLEN && len > 0) {
|
||||
while (outlen < max_unistr_len && len > 0) {
|
||||
size = asc2unichar(sb, astr, len, &c);
|
||||
|
||||
if (decompose)
|
||||
|
@ -311,7 +312,7 @@ int hfsplus_asc2uni(struct super_block *sb, struct hfsplus_unistr *ustr,
|
|||
else
|
||||
dstr = NULL;
|
||||
if (dstr) {
|
||||
if (outlen + dsize > HFSPLUS_MAX_STRLEN)
|
||||
if (outlen + dsize > max_unistr_len)
|
||||
break;
|
||||
do {
|
||||
ustr->unicode[outlen++] = cpu_to_be16(*dstr++);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue