utf8 conversion: mostly working, help has issues

Localization seems to work.  The main help viewer dies though.  Other
parts of help seem to work.  Index causes a crash too.

Crash:
*** Error in `/usr/dt/bin/dthelpview': malloc(): memory corruption (fast): 0x00000000021fefb0 ***
======= Backtrace: =========
/lib/x86_64-linux-gnu/libc.so.6(+0x777e5)[0x7f61814917e5]
/lib/x86_64-linux-gnu/libc.so.6(+0x82651)[0x7f618149c651]
/lib/x86_64-linux-gnu/libc.so.6(__libc_malloc+0x54)[0x7f618149e184]
/usr/lib/x86_64-linux-gnu/libxcb.so.1(+0xc2ab)[0x7f617f71d2ab]
/usr/lib/x86_64-linux-gnu/libxcb.so.1(+0x9ed1)[0x7f617f71aed1]
/usr/lib/x86_64-linux-gnu/libxcb.so.1(+0xa31d)[0x7f617f71b31d]
/usr/lib/x86_64-linux-gnu/libxcb.so.1(xcb_writev+0x45)[0x7f617f71b3a5]
/usr/lib/x86_64-linux-gnu/libX11.so.6(_XSend+0x19e)[0x7f6181b2a54e]
/usr/lib/x86_64-linux-gnu/libX11.so.6(_XReply+0x82)[0x7f6181b2aa42]
/usr/lib/x86_64-linux-gnu/libX11.so.6(XSync+0x4d)[0x7f6181b2652d]
/usr/lib/x86_64-linux-gnu/libXm.so.4(XmUpdateDisplay+0x49)[0x7f61821c1d89]
/usr/dt/lib/libDtHelp.so.2(+0x2cf1d)[0x7f6182ae8f1d]
/usr/dt/lib/libDtHelp.so.2(+0x2d66d)[0x7f6182ae966d]
/usr/dt/lib/libDtHelp.so.2(_DtHelpGlobSrchDisplayDialog+0x2205)[0x7f6182aebca5]
/usr/dt/lib/libDtHelp.so.2(_DtHelpDisplayIndexCB+0x26)[0x7f6182af07e6]
/usr/lib/x86_64-linux-gnu/libXm.so.4(+0xde9d5)[0x7f618216e9d5]
/usr/lib/x86_64-linux-gnu/libXm.so.4(+0xdf0c5)[0x7f618216f0c5]
/usr/lib/x86_64-linux-gnu/libXm.so.4(_XmDispatchGadgetInput+0x113)[0x7f6182140683]
/usr/lib/x86_64-linux-gnu/libXm.so.4(_XmGadgetActivate+0x22)[0x7f61821ef0b2]
/usr/lib/x86_64-linux-gnu/libXt.so.6(+0x48965)[0x7f6181e6f965]
/usr/lib/x86_64-linux-gnu/libXt.so.6(_XtTranslateEvent+0x31a)[0x7f6181e7090a]
/usr/lib/x86_64-linux-gnu/libXt.so.6(XtDispatchEventToWidget+0x4cb)[0x7f6181e4921b]
/usr/lib/x86_64-linux-gnu/libXt.so.6(+0x228dd)[0x7f6181e498dd]
/usr/lib/x86_64-linux-gnu/libXt.so.6(XtDispatchEvent+0xc9)[0x7f6181e499b9]
/usr/lib/x86_64-linux-gnu/libXt.so.6(XtAppProcessEvent+0x1d7)[0x7f6181e555d7]
/usr/lib/x86_64-linux-gnu/libXt.so.6(XtAppMainLoop+0x2d)[0x7f6181e49d9d]
/usr/dt/bin/dthelpview[0x401b77]
/lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf0)[0x7f618143a830]
/usr/dt/bin/dthelpview[0x401c89]

diff --git a/cde/databases/CDE-RUN.udb b/cde/databases/CDE-RUN.udb
index 49013224ceaddff34cd7bf539c59ac58e3e788ff..ce3517c6aa9152bba8147588acc553571be8ff76 100644 (file)
--- a/cde/databases/CDE-RUN.udb
+++ b/cde/databases/CDE-RUN.udb
@@ -2636,44 +2636,44 @@ programs/localized/C/dtsr/eng.stp
        install_target = /usr/dt/infolib/etc/C/dtsr/eng.stp
 }
 #
-programs/localized/de_DE.ISO8859-1/dtsr/deu.sfx
+programs/localized/de_DE.UTF-8/dtsr/deu.sfx
 { default
-       install_target = /usr/dt/infolib/etc/de_DE.ISO8859-1/dtsr/deu.sfx
+       install_target = /usr/dt/infolib/etc/de_DE.UTF-8/dtsr/deu.sfx
 }
 #
-programs/localized/de_DE.ISO8859-1/dtsr/deu.stp
+programs/localized/de_DE.UTF-8/dtsr/deu.stp
 { default
-       install_target = /usr/dt/infolib/etc/de_DE.ISO8859-1/dtsr/deu.stp
+       install_target = /usr/dt/infolib/etc/de_DE.UTF-8/dtsr/deu.stp
 }
 #
-programs/localized/es_ES.ISO8859-1/dtsr/esp.sfx
+programs/localized/es_ES.UTF-8/dtsr/esp.sfx
 { default
-       install_target = /usr/dt/infolib/etc/es_ES.ISO8859-1/dtsr/esp.sfx
+       install_target = /usr/dt/infolib/etc/es_ES.UTF-8/dtsr/esp.sfx
 }
 #
-programs/localized/es_ES.ISO8859-1/dtsr/esp.stp
+programs/localized/es_ES.UTF-8/dtsr/esp.stp
 { default
-       install_target = /usr/dt/infolib/etc/es_ES.ISO8859-1/dtsr/esp.stp
+       install_target = /usr/dt/infolib/etc/es_ES.UTF-8/dtsr/esp.stp
 }
 #
-programs/localized/fr_FR.ISO8859-1/dtsr/fra.sfx
+programs/localized/fr_FR.UTF-8/dtsr/fra.sfx
 { default
-       install_target = /usr/dt/infolib/etc/fr_FR.ISO8859-1/dtsr/fra.sfx
+       install_target = /usr/dt/infolib/etc/fr_FR.UTF-8/dtsr/fra.sfx
 }
 #
-programs/localized/fr_FR.ISO8859-1/dtsr/fra.stp
+programs/localized/fr_FR.UTF-8/dtsr/fra.stp
 { default
-       install_target = /usr/dt/infolib/etc/fr_FR.ISO8859-1/dtsr/fra.stp
+       install_target = /usr/dt/infolib/etc/fr_FR.UTF-8/dtsr/fra.stp
 }
 #
-programs/localized/it_IT.ISO8859-1/dtsr/ita.sfx
+programs/localized/it_IT.UTF-8/dtsr/ita.sfx
 { default
-       install_target = /usr/dt/infolib/etc/it_IT.ISO8859-1/dtsr/ita.sfx
+       install_target = /usr/dt/infolib/etc/it_IT.UTF-8/dtsr/ita.sfx
 }
 #
-programs/localized/it_IT.ISO8859-1/dtsr/ita.stp
+programs/localized/it_IT.UTF-8/dtsr/ita.stp
 { default
-       install_target = /usr/dt/infolib/etc/it_IT.ISO8859-1/dtsr/ita.stp
+       install_target = /usr/dt/infolib/etc/it_IT.UTF-8/dtsr/ita.stp
 }
 #
 programs/localized/ja_JP.dt-eucJP/dtsr/jpn.knj

diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile
index f95da01e509ca22ef730387411570e3769a666e1..958b5329495927733cfbb30192945767072b3816 100644 (file)
--- a/cde/databases/Imakefile
+++ b/cde/databases/Imakefile
@@ -211,7 +211,7 @@ CppSourceFile(CDE-LOC-DE.tmp,CDE-LOC.src,$(DE_LOC_CPP_LIST),)
 CppSourceFile(CDE-HELP-LOC-DE.tmp,CDE-HELP-LOC.src,$(DE_LOC_CPP_LIST),)
 CppSourceFile(CDE-MSG-LOC-DE.tmp,CDE-MSG-LOC.src,$(DE_LOC_CPP_LIST),)
 CppSourceFile(CDE-INFOLIB-LOC-DE.tmp,CDE-INFOLIB-LOC.src,$(DE_LOC_CPP_LIST),)
-CreateLocalizedFilesets(DE,de_DE.UTF-8,German,CDE-LANGS,CDE-GER-I-HELP,CDE-GER-I-MSG,de_DE.UTF-8,de_DE.UTF-8,CDE-LOC-DE.tmp,CDE-HELP-LOC-DE.tmp,CDE-MSG-LOC-DE.tmp,CDE-INFOLIB-LOC-DE.tmp)
+CreateLocalizedFilesets(DE,de_DE.UTF-8,German,CDE-LANGS,CDE-GER-I-HELP,CDE-GER-I-MSG,de_DE.UTF-8,de_DE.ISO8859-1,CDE-LOC-DE.tmp,CDE-HELP-LOC-DE.tmp,CDE-MSG-LOC-DE.tmp,CDE-INFOLIB-LOC-DE.tmp)
 
 /*
  * Spanish
@@ -221,7 +221,7 @@ CppSourceFile(CDE-LOC-ES.tmp,CDE-LOC.src,$(ES_LOC_CPP_LIST),)
 CppSourceFile(CDE-HELP-LOC-ES.tmp,CDE-HELP-LOC.src,$(ES_LOC_CPP_LIST),)
 CppSourceFile(CDE-MSG-LOC-ES.tmp,CDE-MSG-LOC.src,$(ES_LOC_CPP_LIST),)
 CppSourceFile(CDE-INFOLIB-LOC-ES.tmp,CDE-INFOLIB-LOC.src,$(ES_LOC_CPP_LIST),)
-CreateLocalizedFilesets(ES,es_ES.UTF-8,Spanish,CDE-LANGS,CDE-SPA-I-HELP,CDE-SPA-I-MSG,es_ES.UTF-8,es_ES.UTF-8,CDE-LOC-ES.tmp,CDE-HELP-LOC-ES.tmp,CDE-MSG-LOC-ES.tmp,CDE-INFOLIB-LOC-ES.tmp)
+CreateLocalizedFilesets(ES,es_ES.UTF-8,Spanish,CDE-LANGS,CDE-SPA-I-HELP,CDE-SPA-I-MSG,es_ES.UTF-8,es_ES.ISO8859-1,CDE-LOC-ES.tmp,CDE-HELP-LOC-ES.tmp,CDE-MSG-LOC-ES.tmp,CDE-INFOLIB-LOC-ES.tmp)
 
 /*
  * French
@@ -231,7 +231,7 @@ CppSourceFile(CDE-LOC-FR.tmp,CDE-LOC.src,$(FR_LOC_CPP_LIST),)
 CppSourceFile(CDE-HELP-LOC-FR.tmp,CDE-HELP-LOC.src,$(FR_LOC_CPP_LIST),)
 CppSourceFile(CDE-MSG-LOC-FR.tmp,CDE-MSG-LOC.src,$(FR_LOC_CPP_LIST),)
 CppSourceFile(CDE-INFOLIB-LOC-FR.tmp,CDE-INFOLIB-LOC.src,$(FR_LOC_CPP_LIST),)
-CreateLocalizedFilesets(FR,fr_FR.UTF-8,French,CDE-LANGS,CDE-FRE-I-HELP,CDE-FRE-I-MSG,fr_FR.UTF-8,fr_FR.UTF-8,CDE-LOC-FR.tmp,CDE-HELP-LOC-FR.tmp,CDE-MSG-LOC-FR.tmp,CDE-INFOLIB-LOC-FR.tmp)
+CreateLocalizedFilesets(FR,fr_FR.UTF-8,French,CDE-LANGS,CDE-FRE-I-HELP,CDE-FRE-I-MSG,fr_FR.UTF-8,fr_FR.ISO8859-1,CDE-LOC-FR.tmp,CDE-HELP-LOC-FR.tmp,CDE-MSG-LOC-FR.tmp,CDE-INFOLIB-LOC-FR.tmp)
 
 /*
  * Italian
@@ -241,7 +241,7 @@ CppSourceFile(CDE-LOC-IT.tmp,CDE-LOC.src,$(IT_LOC_CPP_LIST),)
 CppSourceFile(CDE-HELP-LOC-IT.tmp,CDE-HELP-LOC.src,$(IT_LOC_CPP_LIST),)
 CppSourceFile(CDE-MSG-LOC-IT.tmp,CDE-MSG-LOC.src,$(IT_LOC_CPP_LIST),)
 CppSourceFile(CDE-INFOLIB-LOC-IT.tmp,CDE-INFOLIB-LOC.src,$(IT_LOC_CPP_LIST),)
-CreateLocalizedFilesets(IT,it_IT.UTF-8,Italian,CDE-LANGS,CDE-ITA-I-HELP,CDE-ITA-I-MSG,it_IT.UTF-8,it_IT.UTF-8,CDE-LOC-IT.tmp,CDE-HELP-LOC-IT.tmp,CDE-MSG-LOC-IT.tmp,CDE-INFOLIB-LOC-IT.tmp)
+CreateLocalizedFilesets(IT,it_IT.UTF-8,Italian,CDE-LANGS,CDE-ITA-I-HELP,CDE-ITA-I-MSG,it_IT.UTF-8,it_IT.ISO8859-1,CDE-LOC-IT.tmp,CDE-HELP-LOC-IT.tmp,CDE-MSG-LOC-IT.tmp,CDE-INFOLIB-LOC-IT.tmp)
 
 /*
  * Japanese