Commit 4de151d8 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Adrian Bunk

It's UTF-8

Fix some comments to "UTF-8".
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent e0f4ab8a
...@@ -9,9 +9,9 @@ when using discs encoded using Microsoft's Joliet extensions. ...@@ -9,9 +9,9 @@ when using discs encoded using Microsoft's Joliet extensions.
iocharset=name Character set to use for converting from Unicode to iocharset=name Character set to use for converting from Unicode to
ASCII. Joliet filenames are stored in Unicode format, but ASCII. Joliet filenames are stored in Unicode format, but
Unix for the most part doesn't know how to deal with Unicode. Unix for the most part doesn't know how to deal with Unicode.
There is also an option of doing UTF8 translations with the There is also an option of doing UTF-8 translations with the
utf8 option. utf8 option.
utf8 Encode Unicode names in UTF8 format. Default is no. utf8 Encode Unicode names in UTF-8 format. Default is no.
Mount options unique to the isofs filesystem. Mount options unique to the isofs filesystem.
block=512 Set the block size for the disk to 512 bytes block=512 Set the block size for the disk to 512 bytes
......
...@@ -6,7 +6,7 @@ The following mount options are supported: ...@@ -6,7 +6,7 @@ The following mount options are supported:
iocharset=name Character set to use for converting from Unicode to iocharset=name Character set to use for converting from Unicode to
ASCII. The default is to do no conversion. Use ASCII. The default is to do no conversion. Use
iocharset=utf8 for UTF8 translations. This requires iocharset=utf8 for UTF-8 translations. This requires
CONFIG_NLS_UTF8 to be set in the kernel .config file. CONFIG_NLS_UTF8 to be set in the kernel .config file.
iocharset=none specifies the default behavior explicitly. iocharset=none specifies the default behavior explicitly.
......
...@@ -28,16 +28,16 @@ iocharset=name -- Character set to use for converting between the ...@@ -28,16 +28,16 @@ iocharset=name -- Character set to use for converting between the
know how to deal with Unicode. know how to deal with Unicode.
By default, FAT_DEFAULT_IOCHARSET setting is used. By default, FAT_DEFAULT_IOCHARSET setting is used.
There is also an option of doing UTF8 translations There is also an option of doing UTF-8 translations
with the utf8 option. with the utf8 option.
NOTE: "iocharset=utf8" is not recommended. If unsure, NOTE: "iocharset=utf8" is not recommended. If unsure,
you should consider the following option instead. you should consider the following option instead.
utf8=<bool> -- UTF8 is the filesystem safe version of Unicode that utf8=<bool> -- UTF-8 is the filesystem safe version of Unicode that
is used by the console. It can be be enabled for the is used by the console. It can be be enabled for the
filesystem with this option. If 'uni_xlate' gets set, filesystem with this option. If 'uni_xlate' gets set,
UTF8 gets disabled. UTF-8 gets disabled.
uni_xlate=<bool> -- Translate unhandled Unicode characters to special uni_xlate=<bool> -- Translate unhandled Unicode characters to special
escaped sequences. This would let you backup and escaped sequences. This would let you backup and
......
...@@ -561,7 +561,7 @@ befs_utf2nls(struct super_block *sb, const char *in, ...@@ -561,7 +561,7 @@ befs_utf2nls(struct super_block *sb, const char *in,
* @sb: Superblock * @sb: Superblock
* @src: Input string buffer in NLS format * @src: Input string buffer in NLS format
* @srclen: Length of input string in bytes * @srclen: Length of input string in bytes
* @dest: The output string in UTF8 format * @dest: The output string in UTF-8 format
* @destlen: Length of the output buffer * @destlen: Length of the output buffer
* *
* Converts input string @src, which is in the format of the loaded NLS map, * Converts input string @src, which is in the format of the loaded NLS map,
......
...@@ -160,7 +160,7 @@ improperly zeroed buffer in CIFS Unix extensions set times call. ...@@ -160,7 +160,7 @@ improperly zeroed buffer in CIFS Unix extensions set times call.
Version 1.25 Version 1.25
------------ ------------
Fix internationalization problem in cifs readdir with filenames that map to Fix internationalization problem in cifs readdir with filenames that map to
longer UTF8 strings than the string on the wire was in Unicode. Add workaround longer UTF-8 strings than the string on the wire was in Unicode. Add workaround
for readdir to netapp servers. Fix search rewind (seek into readdir to return for readdir to netapp servers. Fix search rewind (seek into readdir to return
non-consecutive entries). Do not do readdir when server negotiates non-consecutive entries). Do not do readdir when server negotiates
buffer size to small to fit filename. Add support for reading POSIX ACLs from buffer size to small to fit filename. Add support for reading POSIX ACLs from
......
...@@ -114,7 +114,7 @@ static inline int fat_get_entry(struct inode *dir, loff_t *pos, ...@@ -114,7 +114,7 @@ static inline int fat_get_entry(struct inode *dir, loff_t *pos,
} }
/* /*
* Convert Unicode 16 to UTF8, translated Unicode, or ASCII. * Convert Unicode 16 to UTF-8, translated Unicode, or ASCII.
* If uni_xlate is enabled and we can't get a 1:1 conversion, use a * If uni_xlate is enabled and we can't get a 1:1 conversion, use a
* colon as an escape character since it is normally invalid on the vfat * colon as an escape character since it is normally invalid on the vfat
* filesystem. The following four characters are the hexadecimal digits * filesystem. The following four characters are the hexadecimal digits
......
...@@ -1101,7 +1101,7 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug, ...@@ -1101,7 +1101,7 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
return -EINVAL; return -EINVAL;
} }
} }
/* UTF8 doesn't provide FAT semantics */ /* UTF-8 doesn't provide FAT semantics */
if (!strcmp(opts->iocharset, "utf8")) { if (!strcmp(opts->iocharset, "utf8")) {
printk(KERN_ERR "FAT: utf8 is not a recommended IO charset" printk(KERN_ERR "FAT: utf8 is not a recommended IO charset"
" for FAT filesystems, filesystem will be case sensitive!\n"); " for FAT filesystems, filesystem will be case sensitive!\n");
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "isofs.h" #include "isofs.h"
/* /*
* Convert Unicode 16 to UTF8 or ASCII. * Convert Unicode 16 to UTF-8 or ASCII.
*/ */
static int static int
uni16_to_x8(unsigned char *ascii, u16 *uni, int len, struct nls_table *nls) uni16_to_x8(unsigned char *ascii, u16 *uni, int len, struct nls_table *nls)
......
...@@ -491,7 +491,7 @@ config NLS_KOI8_U ...@@ -491,7 +491,7 @@ config NLS_KOI8_U
(koi8-u) and Belarusian (koi8-ru) character sets. (koi8-u) and Belarusian (koi8-ru) character sets.
config NLS_UTF8 config NLS_UTF8
tristate "NLS UTF8" tristate "NLS UTF-8"
depends on NLS depends on NLS
help help
If you want to display filenames with native language characters If you want to display filenames with native language characters
......
...@@ -77,7 +77,7 @@ struct termios { ...@@ -77,7 +77,7 @@ struct termios {
#define IXANY 0004000 /* Any character will restart after stop. */ #define IXANY 0004000 /* Any character will restart after stop. */
#define IXOFF 0010000 /* Enable start/stop input control. */ #define IXOFF 0010000 /* Enable start/stop input control. */
#define IMAXBEL 0020000 /* Ring bell when input queue is full. */ #define IMAXBEL 0020000 /* Ring bell when input queue is full. */
#define IUTF8 0040000 /* Input is UTF8 */ #define IUTF8 0040000 /* Input is UTF-8 */
/* c_oflag bits */ /* c_oflag bits */
#define OPOST 0000001 /* Perform output processing. */ #define OPOST 0000001 /* Perform output processing. */
......
...@@ -199,7 +199,7 @@ struct fat_mount_options { ...@@ -199,7 +199,7 @@ struct fat_mount_options {
sys_immutable:1, /* set = system files are immutable */ sys_immutable:1, /* set = system files are immutable */
dotsOK:1, /* set = hidden and system files are named '.filename' */ dotsOK:1, /* set = hidden and system files are named '.filename' */
isvfat:1, /* 0=no vfat long filename support, 1=vfat support */ isvfat:1, /* 0=no vfat long filename support, 1=vfat support */
utf8:1, /* Use of UTF8 character set (Default) */ utf8:1, /* Use of UTF-8 character set (Default) */
unicode_xlate:1, /* create escape sequences for unhandled Unicode */ unicode_xlate:1, /* create escape sequences for unhandled Unicode */
numtail:1, /* Does first alias have a numeric '~1' type tail? */ numtail:1, /* Does first alias have a numeric '~1' type tail? */
atari:1, /* Use Atari GEMDOS variation of MS-DOS fs */ atari:1, /* Use Atari GEMDOS variation of MS-DOS fs */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment