X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fudf%2Funicode.c;h=9fdf8c93c58e7893616bea99730cc594a3731361;hb=1a781a777b2f6ac46523fe92396215762ced624d;hp=46835240275c9829aeb26773df610edccf282d52;hpb=f4fbfb0dda5577075a049eec7fb7ad38abca1912;p=linux-2.6 diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c index 4683524027..9fdf8c93c5 100644 --- a/fs/udf/unicode.c +++ b/fs/udf/unicode.c @@ -23,45 +23,50 @@ #include #include /* for memset */ #include -#include +#include #include "udf_sb.h" static int udf_translate_to_linux(uint8_t *, uint8_t *, int, uint8_t *, int); -static int udf_char_to_ustr(struct ustr *dest, const uint8_t * src, int strlen) +static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) { if ((!dest) || (!src) || (!strlen) || (strlen > UDF_NAME_LEN - 2)) return 0; + memset(dest, 0, sizeof(struct ustr)); memcpy(dest->u_name, src, strlen); dest->u_cmpID = 0x08; dest->u_len = strlen; + return strlen; } /* * udf_build_ustr */ -int udf_build_ustr(struct ustr *dest, dstring * ptr, int size) +int udf_build_ustr(struct ustr *dest, dstring *ptr, int size) { int usesize; - if ((!dest) || (!ptr) || (!size)) + if (!dest || !ptr || !size) return -1; + BUG_ON(size < 2); - memset(dest, 0, sizeof(struct ustr)); - usesize = (size > UDF_NAME_LEN) ? UDF_NAME_LEN : size; + usesize = min_t(size_t, ptr[size - 1], sizeof(dest->u_name)); + usesize = min(usesize, size - 2); dest->u_cmpID = ptr[0]; - dest->u_len = ptr[size - 1]; - memcpy(dest->u_name, ptr + 1, usesize - 1); + dest->u_len = usesize; + memcpy(dest->u_name, ptr + 1, usesize); + memset(dest->u_name + usesize, 0, sizeof(dest->u_name) - usesize); + return 0; } /* * udf_build_ustr_exact */ -static int udf_build_ustr_exact(struct ustr *dest, dstring * ptr, int exactsize) +static int udf_build_ustr_exact(struct ustr *dest, dstring *ptr, int exactsize) { if ((!dest) || (!ptr) || (!exactsize)) return -1; @@ -70,6 +75,7 @@ static int udf_build_ustr_exact(struct ustr *dest, dstring * ptr, int exactsize) dest->u_cmpID = ptr[0]; dest->u_len = exactsize - 1; memcpy(dest->u_name, ptr + 1, exactsize - 1); + return 0; } @@ -79,9 +85,6 @@ static int udf_build_ustr_exact(struct ustr *dest, dstring * ptr, int exactsize) * PURPOSE * Convert OSTA Compressed Unicode to the UTF-8 equivalent. * - * DESCRIPTION - * This routine is only called by udf_filldir(). - * * PRE-CONDITIONS * utf Pointer to UTF-8 output buffer. * ocu Pointer to OSTA Compressed Unicode input buffer @@ -95,54 +98,51 @@ static int udf_build_ustr_exact(struct ustr *dest, dstring * ptr, int exactsize) * November 12, 1997 - Andrew E. Mileski * Written, tested, and released. */ -int udf_CS0toUTF8(struct ustr *utf_o, struct ustr *ocu_i) +int udf_CS0toUTF8(struct ustr *utf_o, const struct ustr *ocu_i) { - uint8_t *ocu; - uint32_t c; + const uint8_t *ocu; uint8_t cmp_id, ocu_len; int i; - ocu = ocu_i->u_name; - ocu_len = ocu_i->u_len; - cmp_id = ocu_i->u_cmpID; - utf_o->u_len = 0; - if (ocu_len == 0) { memset(utf_o, 0, sizeof(struct ustr)); - utf_o->u_cmpID = 0; - utf_o->u_len = 0; return 0; } - if ((cmp_id != 8) && (cmp_id != 16)) { + cmp_id = ocu_i->u_cmpID; + if (cmp_id != 8 && cmp_id != 16) { + memset(utf_o, 0, sizeof(struct ustr)); printk(KERN_ERR "udf: unknown compression code (%d) stri=%s\n", cmp_id, ocu_i->u_name); return 0; } + ocu = ocu_i->u_name; + utf_o->u_len = 0; for (i = 0; (i < ocu_len) && (utf_o->u_len <= (UDF_NAME_LEN - 3));) { /* Expand OSTA compressed Unicode to Unicode */ - c = ocu[i++]; + uint32_t c = ocu[i++]; if (cmp_id == 16) c = (c << 8) | ocu[i++]; /* Compress Unicode to UTF-8 */ if (c < 0x80U) - utf_o->u_name[utf_o->u_len++] = (uint8_t) c; + utf_o->u_name[utf_o->u_len++] = (uint8_t)c; else if (c < 0x800U) { utf_o->u_name[utf_o->u_len++] = - (uint8_t) (0xc0 | (c >> 6)); + (uint8_t)(0xc0 | (c >> 6)); utf_o->u_name[utf_o->u_len++] = - (uint8_t) (0x80 | (c & 0x3f)); + (uint8_t)(0x80 | (c & 0x3f)); } else { utf_o->u_name[utf_o->u_len++] = - (uint8_t) (0xe0 | (c >> 12)); + (uint8_t)(0xe0 | (c >> 12)); utf_o->u_name[utf_o->u_len++] = - (uint8_t) (0x80 | ((c >> 6) & 0x3f)); + (uint8_t)(0x80 | + ((c >> 6) & 0x3f)); utf_o->u_name[utf_o->u_len++] = - (uint8_t) (0x80 | (c & 0x3f)); + (uint8_t)(0x80 | (c & 0x3f)); } } utf_o->u_cmpID = 8; @@ -173,7 +173,7 @@ int udf_CS0toUTF8(struct ustr *utf_o, struct ustr *ocu_i) * November 12, 1997 - Andrew E. Mileski * Written, tested, and released. */ -static int udf_UTF8toCS0(dstring * ocu, struct ustr *utf, int length) +static int udf_UTF8toCS0(dstring *ocu, struct ustr *utf, int length) { unsigned c, i, max_val, utf_char; int utf_cnt, u_len; @@ -182,12 +182,12 @@ static int udf_UTF8toCS0(dstring * ocu, struct ustr *utf, int length) ocu[0] = 8; max_val = 0xffU; - try_again: +try_again: u_len = 0U; utf_char = 0U; utf_cnt = 0U; for (i = 0U; i < utf->u_len; i++) { - c = (uint8_t) utf->u_name[i]; + c = (uint8_t)utf->u_name[i]; /* Complete a multi-byte UTF-8 character */ if (utf_cnt) { @@ -213,70 +213,69 @@ static int udf_UTF8toCS0(dstring * ocu, struct ustr *utf, int length) } else if ((c & 0xfeU) == 0xfcU) { utf_char = c & 0x01U; utf_cnt = 5; - } else + } else { goto error_out; + } continue; - } else + } else { /* Single byte UTF-8 character (most common) */ utf_char = c; + } } /* Choose no compression if necessary */ if (utf_char > max_val) { - if (0xffU == max_val) { + if (max_val == 0xffU) { max_val = 0xffffU; - ocu[0] = (uint8_t) 0x10U; + ocu[0] = (uint8_t)0x10U; goto try_again; } goto error_out; } - if (max_val == 0xffffU) { - ocu[++u_len] = (uint8_t) (utf_char >> 8); - } - ocu[++u_len] = (uint8_t) (utf_char & 0xffU); + if (max_val == 0xffffU) + ocu[++u_len] = (uint8_t)(utf_char >> 8); + ocu[++u_len] = (uint8_t)(utf_char & 0xffU); } if (utf_cnt) { - error_out: +error_out: ocu[++u_len] = '?'; printk(KERN_DEBUG "udf: bad UTF-8 character\n"); } - ocu[length - 1] = (uint8_t) u_len + 1; + ocu[length - 1] = (uint8_t)u_len + 1; + return u_len + 1; } static int udf_CS0toNLS(struct nls_table *nls, struct ustr *utf_o, - struct ustr *ocu_i) + const struct ustr *ocu_i) { - uint8_t *ocu; - uint32_t c; + const uint8_t *ocu; uint8_t cmp_id, ocu_len; int i; - ocu = ocu_i->u_name; ocu_len = ocu_i->u_len; - cmp_id = ocu_i->u_cmpID; - utf_o->u_len = 0; - if (ocu_len == 0) { memset(utf_o, 0, sizeof(struct ustr)); - utf_o->u_cmpID = 0; - utf_o->u_len = 0; return 0; } - if ((cmp_id != 8) && (cmp_id != 16)) { + cmp_id = ocu_i->u_cmpID; + if (cmp_id != 8 && cmp_id != 16) { + memset(utf_o, 0, sizeof(struct ustr)); printk(KERN_ERR "udf: unknown compression code (%d) stri=%s\n", cmp_id, ocu_i->u_name); return 0; } + ocu = ocu_i->u_name; + utf_o->u_len = 0; for (i = 0; (i < ocu_len) && (utf_o->u_len <= (UDF_NAME_LEN - 3));) { /* Expand OSTA compressed Unicode to Unicode */ - c = ocu[i++]; + uint32_t c = ocu[i++]; if (cmp_id == 16) c = (c << 8) | ocu[i++]; @@ -288,7 +287,7 @@ static int udf_CS0toNLS(struct nls_table *nls, struct ustr *utf_o, return utf_o->u_len; } -static int udf_NLStoCS0(struct nls_table *nls, dstring * ocu, struct ustr *uni, +static int udf_NLStoCS0(struct nls_table *nls, dstring *ocu, struct ustr *uni, int length) { unsigned len, i, max_val; @@ -299,7 +298,7 @@ static int udf_NLStoCS0(struct nls_table *nls, dstring * ocu, struct ustr *uni, ocu[0] = 8; max_val = 0xffU; - try_again: +try_again: u_len = 0U; for (i = 0U; i < uni->u_len; i++) { len = nls->char2uni(&uni->u_name[i], uni->u_len - i, &uni_char); @@ -308,29 +307,28 @@ static int udf_NLStoCS0(struct nls_table *nls, dstring * ocu, struct ustr *uni, if (uni_char > max_val) { max_val = 0xffffU; - ocu[0] = (uint8_t) 0x10U; + ocu[0] = (uint8_t)0x10U; goto try_again; } if (max_val == 0xffffU) - ocu[++u_len] = (uint8_t) (uni_char >> 8); - ocu[++u_len] = (uint8_t) (uni_char & 0xffU); + ocu[++u_len] = (uint8_t)(uni_char >> 8); + ocu[++u_len] = (uint8_t)(uni_char & 0xffU); i += len - 1; } - ocu[length - 1] = (uint8_t) u_len + 1; + ocu[length - 1] = (uint8_t)u_len + 1; return u_len + 1; } -int udf_get_filename(struct super_block *sb, uint8_t * sname, uint8_t * dname, +int udf_get_filename(struct super_block *sb, uint8_t *sname, uint8_t *dname, int flen) { struct ustr filename, unifilename; int len; - if (udf_build_ustr_exact(&unifilename, sname, flen)) { + if (udf_build_ustr_exact(&unifilename, sname, flen)) return 0; - } if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8)) { if (!udf_CS0toUTF8(&filename, &unifilename)) { @@ -339,8 +337,8 @@ int udf_get_filename(struct super_block *sb, uint8_t * sname, uint8_t * dname, return 0; } } else if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) { - if (!udf_CS0toNLS - (UDF_SB(sb)->s_nls_map, &filename, &unifilename)) { + if (!udf_CS0toNLS(UDF_SB(sb)->s_nls_map, &filename, + &unifilename)) { udf_debug("Failed in udf_get_filename: sname = %s\n", sname); return 0; @@ -348,37 +346,32 @@ int udf_get_filename(struct super_block *sb, uint8_t * sname, uint8_t * dname, } else return 0; - if ((len = - udf_translate_to_linux(dname, filename.u_name, filename.u_len, - unifilename.u_name, unifilename.u_len))) { + len = udf_translate_to_linux(dname, filename.u_name, filename.u_len, + unifilename.u_name, unifilename.u_len); + if (len) return len; - } + return 0; } -int udf_put_filename(struct super_block *sb, const uint8_t * sname, - uint8_t * dname, int flen) +int udf_put_filename(struct super_block *sb, const uint8_t *sname, + uint8_t *dname, int flen) { struct ustr unifilename; int namelen; - if (!(udf_char_to_ustr(&unifilename, sname, flen))) { + if (!udf_char_to_ustr(&unifilename, sname, flen)) return 0; - } if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8)) { - if (! - (namelen = - udf_UTF8toCS0(dname, &unifilename, UDF_NAME_LEN))) { + namelen = udf_UTF8toCS0(dname, &unifilename, UDF_NAME_LEN); + if (!namelen) return 0; - } } else if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) { - if (! - (namelen = - udf_NLStoCS0(UDF_SB(sb)->s_nls_map, dname, &unifilename, - UDF_NAME_LEN))) { + namelen = udf_NLStoCS0(UDF_SB(sb)->s_nls_map, dname, + &unifilename, UDF_NAME_LEN); + if (!namelen) return 0; - } } else return 0; @@ -386,12 +379,13 @@ int udf_put_filename(struct super_block *sb, const uint8_t * sname, } #define ILLEGAL_CHAR_MARK '_' -#define EXT_MARK '.' -#define CRC_MARK '#' -#define EXT_SIZE 5 +#define EXT_MARK '.' +#define CRC_MARK '#' +#define EXT_SIZE 5 -static int udf_translate_to_linux(uint8_t * newName, uint8_t * udfName, - int udfLen, uint8_t * fidName, int fidNameLen) +static int udf_translate_to_linux(uint8_t *newName, uint8_t *udfName, + int udfLen, uint8_t *fidName, + int fidNameLen) { int index, newIndex = 0, needsCRC = 0; int extIndex = 0, newExtIndex = 0, hasExt = 0; @@ -399,8 +393,8 @@ static int udf_translate_to_linux(uint8_t * newName, uint8_t * udfName, uint8_t curr; const uint8_t hexChar[] = "0123456789ABCDEF"; - if (udfName[0] == '.' && (udfLen == 1 || - (udfLen == 2 && udfName[1] == '.'))) { + if (udfName[0] == '.' && + (udfLen == 1 || (udfLen == 2 && udfName[1] == '.'))) { needsCRC = 1; newIndex = udfLen; memcpy(newName, udfName, udfLen); @@ -410,13 +404,13 @@ static int udf_translate_to_linux(uint8_t * newName, uint8_t * udfName, if (curr == '/' || curr == 0) { needsCRC = 1; curr = ILLEGAL_CHAR_MARK; - while (index + 1 < udfLen - && (udfName[index + 1] == '/' - || udfName[index + 1] == 0)) + while (index + 1 < udfLen && + (udfName[index + 1] == '/' || + udfName[index + 1] == 0)) index++; } - if (curr == EXT_MARK - && (udfLen - index - 1) <= EXT_SIZE) { + if (curr == EXT_MARK && + (udfLen - index - 1) <= EXT_SIZE) { if (udfLen == index + 1) hasExt = 0; else { @@ -445,15 +439,10 @@ static int udf_translate_to_linux(uint8_t * newName, uint8_t * udfName, if (curr == '/' || curr == 0) { needsCRC = 1; curr = ILLEGAL_CHAR_MARK; - while (extIndex + index + 2 < udfLen - && (index + 1 < EXT_SIZE - && - (udfName - [extIndex + index + 2] == - '/' - || udfName[extIndex + - index + 2] == - 0))) + while (extIndex + index + 2 < udfLen && + (index + 1 < EXT_SIZE && + (udfName[extIndex + index + 2] == '/' || + udfName[extIndex + index + 2] == 0))) index++; } ext[localExtIndex++] = curr; @@ -466,7 +455,7 @@ static int udf_translate_to_linux(uint8_t * newName, uint8_t * udfName, } else if (newIndex > 250) newIndex = 250; newName[newIndex++] = CRC_MARK; - valueCRC = udf_crc(fidName, fidNameLen, 0); + valueCRC = crc_itu_t(0, fidName, fidNameLen); newName[newIndex++] = hexChar[(valueCRC & 0xf000) >> 12]; newName[newIndex++] = hexChar[(valueCRC & 0x0f00) >> 8]; newName[newIndex++] = hexChar[(valueCRC & 0x00f0) >> 4]; @@ -478,5 +467,6 @@ static int udf_translate_to_linux(uint8_t * newName, uint8_t * udfName, newName[newIndex++] = ext[index]; } } + return newIndex; }