ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fold: unicode support. Based on a patch by Tomas Heinrich <heinrich.tomas@gmail.com>

Browse source 
General Unicode support is tweaked to expose unicode_status.

function                                             old     new   delta
init_unicode                                           -      77     +77
write2stdout                                           -      19     +19
adjust_column                                         68      71      +3
unicode_status                                         -       1      +1
unicode_is_enabled                                     1       -      -1
grep_main                                            780     773      -7
fold_main                                            619     552     -67
check_unicode_in_env                                  77       -     -77
------------------------------------------------------------------------------
(add/remove: 3/2 grow/shrink: 1/2 up/down: 100/-152)          Total: -52 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-04 20:49:58 +01:00
parent d2b1ba6fde
commit 28055028a7
11 changed files with 185 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

46
libbb/unicode.c
View file

@ -7,7 +7,9 @@
* Licensed under GPL version 2, see file LICENSE in this tarball for details.
*/
#include "libbb.h"
# include "unicode.h"
#include "unicode.h"
uint8_t unicode_status;
size_t FAST_FUNC bb_mbstrlen(const char *string)
{
@ -17,32 +19,38 @@ size_t FAST_FUNC bb_mbstrlen(const char *string)
return width;
}
#if !ENABLE_LOCALE_SUPPORT
#if ENABLE_LOCALE_SUPPORT
/* Unicode support using libc */
void FAST_FUNC init_unicode(void)
{
/* In unicode, this is a one character string */
static const char unicode_0x394[] = { 0xce, 0x94, 0 };
if (unicode_status != UNICODE_UNKNOWN)
return;
unicode_status = bb_mbstrlen(unicode_0x394) == 1 ? UNICODE_ON : UNICODE_OFF;
}
#else
/* Crude "locale support" which knows only C and Unicode locales */
/* unicode_is_enabled:
* 0: not known yet,
* 1: not unicode (IOW: assuming one char == one byte)
* 2: unicode
*/
# if !ENABLE_FEATURE_CHECK_UNICODE_IN_ENV
# define unicode_is_enabled 2
# else
static smallint unicode_is_enabled;
void FAST_FUNC check_unicode_in_env(void)
# if ENABLE_FEATURE_CHECK_UNICODE_IN_ENV
void FAST_FUNC init_unicode(void)
{
char *lang;
if (unicode_is_enabled)
if (unicode_status != UNICODE_UNKNOWN)
return;
unicode_is_enabled = 1;
unicode_status = UNICODE_OFF;
lang = getenv("LANG");
if (!lang || !(strstr(lang, ".utf") || strstr(lang, ".UTF")))
return;
unicode_is_enabled = 2;
unicode_status = UNICODE_ON;
}
# endif
@ -85,7 +93,7 @@ static size_t wcrtomb_internal(char *s, wchar_t wc)
size_t FAST_FUNC wcrtomb(char *s, wchar_t wc, mbstate_t *ps UNUSED_PARAM)
{
if (unicode_is_enabled != 2) {
if (unicode_status != UNICODE_ON) {
*s = wc;
return 1;
}
@ -97,7 +105,7 @@ size_t FAST_FUNC wcstombs(char *dest, const wchar_t *src, size_t n)
{
size_t org_n = n;
if (unicode_is_enabled != 2) {
if (unicode_status != UNICODE_ON) {
while (n) {
wchar_t c = *src++;
*dest++ = c;
@ -137,7 +145,7 @@ size_t FAST_FUNC mbstowcs(wchar_t *dest, const char *src, size_t n)
{
size_t org_n = n;
if (unicode_is_enabled != 2) {
if (unicode_status != UNICODE_ON) {
while (n) {
unsigned char c = *src++;