Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:GA
tcsh.19069
tcsh-6.17.06-dspmbyte.dif
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File tcsh-6.17.06-dspmbyte.dif of Package tcsh.19069
--- sh.c +++ sh.c 2010-12-10 16:10:45.000000000 +0000 @@ -849,9 +849,9 @@ main(int argc, char **argv) /* PATCH IDEA FROM Issei.Suzuki VERY THANKS */ #if defined(DSPMBYTE) #if defined(NLS) && defined(LC_CTYPE) - if (((tcp = setlocale(LC_CTYPE, NULL)) != NULL || (tcp = getenv("LANG")) != NULL) && !adrof(CHECK_MBYTEVAR)) + if (((tcp = setlocale(LC_CTYPE, NULL)) != NULL || (tcp = getenv("LANG")) != NULL)) #else - if ((tcp = getenv("LANG")) != NULL && !adrof(CHECK_MBYTEVAR)) + if ((tcp = getenv("LANG")) != NULL) #endif { autoset_dspmbyte(str2short(tcp)); --- sh.func.c +++ sh.func.c 2010-12-09 09:15:06.000000000 +0000 @@ -1406,14 +1406,6 @@ dosetenv(Char **v, struct command *c) } #endif /* apollo */ - /* dspkanji/dspmbyte autosetting */ - /* PATCH IDEA FROM Issei.Suzuki VERY THANKS */ -#if defined(DSPMBYTE) - if(eq(vp, STRLANG) && !adrof(CHECK_MBYTEVAR)) { - autoset_dspmbyte(lp); - } -#endif - if (islocale_var(vp)) { #ifdef NLS int k; @@ -1438,6 +1430,13 @@ dosetenv(Char **v, struct command *c) nlsclose(); nlsinit(); # endif /* NLS_CATALOGS */ +# if defined(DSPMBYTE) + /* dspkanji/dspmbyte autosetting */ + /* PATCH IDEA FROM Issei.Suzuki VERY THANKS */ + if (eq(vp, STRLANG)) { + autoset_dspmbyte(lp); + } +# endif # ifdef SETLOCALEBUG dont_free = 0; # endif /* SETLOCALEBUG */ --- sh.set.c +++ sh.set.c 2010-12-09 11:07:56.000000000 +0000 @@ -1119,11 +1119,11 @@ update_dspmbyte_vars(void) dstr1 = vp->vec[0]; if(eq (dstr1, STRsjis)) iskcode = 1; - else if (eq(dstr1, STReuc)) + else if (eq(dstr1, STReuc) || eq(dstr1, STReucjp) || eq(dstr1, STRGB2312)) iskcode = 2; else if (eq(dstr1, STRbig5)) iskcode = 3; - else if (eq(dstr1, STRutf8)) + else if (eq(dstr1, STRutf8) || eq(dstr1, STRutfx8)) iskcode = 4; else if ((dstr1[0] - '0') >= 0 && (dstr1[0] - '0') <= 3) { iskcode = 0; @@ -1207,7 +1207,7 @@ update_dspmbyte_vars(void) _enable_mbdisp = 0; dspmbyte_ls = 0; } -#ifdef MBYTEDEBUG /* Sorry, use for beta testing */ +# ifdef MBYTEDEBUG /* Sorry, use for beta testing */ { Char mbmapstr[300]; for (lp = 0; lp < 256; lp++) @@ -1215,7 +1215,7 @@ update_dspmbyte_vars(void) mbmapstr[lp] = 0; setcopy(STRmbytemap, mbmapstr, VAR_READWRITE); } -#endif /* MBYTEMAP */ +# endif /* MBYTEMAP */ } /* dspkanji/dspmbyte autosetting */ @@ -1224,6 +1224,7 @@ void autoset_dspmbyte(const Char *pcp) { int i; + struct varent *vp; static const struct dspm_autoset_Table { Char *n; Char *v; @@ -1246,13 +1247,18 @@ autoset_dspmbyte(const Char *pcp) #if defined(HAVE_NL_LANGINFO) && defined(CODESET) static const struct dspm_autoset_Table dspmc[] = { { STRstarutfstar8, STRutf8 }, + { STRutfx8, STRutf8 }, { STReuc, STReuc }, + { STReucjp, STReuc }, { STRGB2312, STReuc }, { STRLANGBIG5, STRbig5 }, { NULL, NULL } }; Char *codeset; + if ((vp = adrof(CHECK_MBYTEVAR))) + unsetv1(vp); + codeset = str2short(nl_langinfo(CODESET)); if (*codeset != '\0') { for (i = 0; dspmc[i].n; i++) { --- tc.const.c +++ tc.const.c 2006-04-25 12:58:31.000000000 +0000 @@ -130,10 +130,12 @@ Char STRmmliteral[] = { '-', 'G', '\0' } Char STRmmliteral[] = { '-', '-', 'l', 'i', 't', 'e', 'r', 'a', 'l', '\0' }; # endif Char STReuc[] = { 'e', 'u', 'c', '\0' }; +Char STReucjp[] = { 'e', 'u', 'c', '-', 'j', 'p', '\0' }; Char STRsjis[] = { 's', 'j', 'i', 's', '\0' }; Char STRbig5[] = { 'b', 'i', 'g', '5', '\0' }; Char STRutf8[] = { 'u', 't', 'f', '8', '\0' }; Char STRstarutfstar8[] = { '*', 'u', 't', 'f', '*', '8', '\0' }; +Char STRutfx8[] = { 'u', 't', 'f', '-', '8', '\0' }; Char STRGB2312[] = { 'g', 'b', '2', '3', '1', '2', '\0' }; # ifdef MBYTEDEBUG /* Sorry, use for beta testing */ Char STRmbytemap[] = { 'm', 'b', 'y', 't', 'e', 'm', 'a', 'p', '\0' }; @@ -437,7 +439,7 @@ Char STRkilldup[] = { 'k', 'i', 'l', 'l Char STRshlvl[] = { 's', 'h', 'l', 'v', 'l', '\0' }; Char STRKSHLVL[] = { 'S', 'H', 'L', 'V', 'L', '\0' }; Char STRLANG[] = { 'L', 'A', 'N', 'G', '\0' }; -Char STRLC_ALL[] = { 'L', 'C', '_', 'A', 'L', 'L', '\0' }; +Char STRLC_ALL[] = { 'L', 'C', '_', 'A', 'L', 'L', '\0' }; Char STRLC_CTYPE[] = { 'L', 'C', '_', 'C', 'T', 'Y', 'P', 'E' ,'\0' }; Char STRLC_NUMERIC[] = { 'L', 'C', '_', 'N', 'U', 'M', 'E', 'R', 'I', 'C', '\0' };
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor