diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 12:31:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 12:31:14 -0400 |
| commit | 4c8f1cb266cba4d1052f524d04df839d8f732ace (patch) | |
| tree | 4bf2e6bcc56dcce2c919bca969f6626c8f18b7e6 /fs/fat/namei_vfat.c | |
| parent | 9c1fe834c1bd7725b411055c66886b64c928083d (diff) | |
| parent | ed248b290da7297c9b9a3ff180f5eee4db016224 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
fat: Check s_dirt in fat_sync_fs()
vfat: change the default from shortname=lower to shortname=mixed
fat/nls: Fix handling of utf8 invalid char
Diffstat (limited to 'fs/fat/namei_vfat.c')
| -rw-r--r-- | fs/fat/namei_vfat.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index cb6e83557112..f565f24019b5 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c | |||
| @@ -499,17 +499,10 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname, | |||
| 499 | int charlen; | 499 | int charlen; |
| 500 | 500 | ||
| 501 | if (utf8) { | 501 | if (utf8) { |
| 502 | int name_len = strlen(name); | 502 | *outlen = utf8s_to_utf16s(name, len, (wchar_t *)outname); |
| 503 | 503 | if (*outlen < 0) | |
| 504 | *outlen = utf8s_to_utf16s(name, PATH_MAX, (wchar_t *) outname); | 504 | return *outlen; |
| 505 | 505 | else if (*outlen > 255) | |
| 506 | /* | ||
| 507 | * We stripped '.'s before and set len appropriately, | ||
| 508 | * but utf8s_to_utf16s doesn't care about len | ||
| 509 | */ | ||
| 510 | *outlen -= (name_len - len); | ||
| 511 | |||
| 512 | if (*outlen > 255) | ||
| 513 | return -ENAMETOOLONG; | 506 | return -ENAMETOOLONG; |
| 514 | 507 | ||
| 515 | op = &outname[*outlen * sizeof(wchar_t)]; | 508 | op = &outname[*outlen * sizeof(wchar_t)]; |