mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 23:51:37 +00:00
c3ed85a36f
fs/isofs/* had a bunch of CodingStyle issues. * Indentation was a mix of spaces and tabs * "int * foo" instead of "int *foo" * "while ( foo )" instead of "while (foo)" * if (foo) blah; on one line instead of two * Missing printk KERN_ levels * lots of trailing whitespace * lines >80 columns changed to wrap. * Unnecessary prototype removed by shuffling code order in C file. Should be no functional changes other than slight size increase due to printk changes. Further improvement possible, but this is a start.. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
100 lines
1.8 KiB
C
100 lines
1.8 KiB
C
/*
|
|
* linux/fs/isofs/joliet.c
|
|
*
|
|
* (C) 1996 Gordon Chaffee
|
|
*
|
|
* Joliet: Microsoft's Unicode extensions to iso9660
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/nls.h>
|
|
#include "isofs.h"
|
|
|
|
/*
|
|
* Convert Unicode 16 to UTF-8 or ASCII.
|
|
*/
|
|
static int
|
|
uni16_to_x8(unsigned char *ascii, __be16 *uni, int len, struct nls_table *nls)
|
|
{
|
|
__be16 *ip, ch;
|
|
unsigned char *op;
|
|
|
|
ip = uni;
|
|
op = ascii;
|
|
|
|
while ((ch = get_unaligned(ip)) && len) {
|
|
int llen;
|
|
llen = nls->uni2char(be16_to_cpu(ch), op, NLS_MAX_CHARSET_SIZE);
|
|
if (llen > 0)
|
|
op += llen;
|
|
else
|
|
*op++ = '?';
|
|
ip++;
|
|
|
|
len--;
|
|
}
|
|
*op = 0;
|
|
return (op - ascii);
|
|
}
|
|
|
|
/* Convert big endian wide character string to utf8 */
|
|
static int
|
|
wcsntombs_be(__u8 *s, const __u8 *pwcs, int inlen, int maxlen)
|
|
{
|
|
const __u8 *ip;
|
|
__u8 *op;
|
|
int size;
|
|
__u16 c;
|
|
|
|
op = s;
|
|
ip = pwcs;
|
|
while ((*ip || ip[1]) && (maxlen > 0) && (inlen > 0)) {
|
|
c = (*ip << 8) | ip[1];
|
|
if (c > 0x7f) {
|
|
size = utf8_wctomb(op, c, maxlen);
|
|
if (size == -1) {
|
|
/* Ignore character and move on */
|
|
maxlen--;
|
|
} else {
|
|
op += size;
|
|
maxlen -= size;
|
|
}
|
|
} else {
|
|
*op++ = (__u8) c;
|
|
}
|
|
ip += 2;
|
|
inlen--;
|
|
}
|
|
return (op - s);
|
|
}
|
|
|
|
int
|
|
get_joliet_filename(struct iso_directory_record * de, unsigned char *outname, struct inode * inode)
|
|
{
|
|
unsigned char utf8;
|
|
struct nls_table *nls;
|
|
unsigned char len = 0;
|
|
|
|
utf8 = ISOFS_SB(inode->i_sb)->s_utf8;
|
|
nls = ISOFS_SB(inode->i_sb)->s_nls_iocharset;
|
|
|
|
if (utf8) {
|
|
len = wcsntombs_be(outname, de->name,
|
|
de->name_len[0] >> 1, PAGE_SIZE);
|
|
} else {
|
|
len = uni16_to_x8(outname, (__be16 *) de->name,
|
|
de->name_len[0] >> 1, nls);
|
|
}
|
|
if ((len > 2) && (outname[len-2] == ';') && (outname[len-1] == '1'))
|
|
len -= 2;
|
|
|
|
/*
|
|
* Windows doesn't like periods at the end of a name,
|
|
* so neither do we
|
|
*/
|
|
while (len >= 2 && (outname[len-1] == '.'))
|
|
len--;
|
|
|
|
return len;
|
|
}
|