Messages in this thread Patch in this message | | | From | Andy Shevchenko <> | Subject | [PATCHv3] fat: don't use custom hex_to_bin() | Date | Thu, 29 Sep 2011 16:15:40 +0300 |
| |
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> --- fs/fat/namei_vfat.c | 37 +++++++++++++++---------------------- 1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index bb3f29c..7deb604 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c @@ -21,6 +21,8 @@ #include <linux/slab.h> #include <linux/buffer_head.h> #include <linux/namei.h> +#include <linux/kernel.h> + #include "fat.h" /* @@ -505,10 +507,8 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname, struct nls_table *nls) { const unsigned char *ip; - unsigned char nc; unsigned char *op; - unsigned int ec; - int i, k, fill; + int i, rc, fill; int charlen; if (utf8) { @@ -528,26 +528,19 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname, if (escape && (*ip == ':')) { if (i > len - 5) return -EINVAL; - ec = 0; - for (k = 1; k < 5; k++) { - nc = ip[k]; - ec <<= 4; - if (nc >= '0' && nc <= '9') { - ec |= nc - '0'; - continue; - } - if (nc >= 'a' && nc <= 'f') { - ec |= nc - ('a' - 10); - continue; - } - if (nc >= 'A' && nc <= 'F') { - ec |= nc - ('A' - 10); - continue; - } + + /* The ip contains 2 bytes in little + * endian format. We need to get them + * in native endian. */ + + rc = hex2bin(op++, ip + 3, 1); + if (rc < 0) + return -EINVAL; + + rc = hex2bin(op++, ip + 1, 1); + if (rc < 0) return -EINVAL; - } - *op++ = ec & 0xFF; - *op++ = ec >> 8; + ip += 5; i += 5; } else { -- 1.7.6.3
| |