1 files changed, 80 insertions, 68 deletions

diff --git a/src/enca.c b/src/enca.c
index 95e2f49..0bb4470 100644
--- a/src/enca.c
+++ b/src/enca.c
@@ -1,23 +1,82 @@
 #include <stdio.h>
 
-#include "librcc.h"
-
+#include "internal.h"
 #include "plugin.h"
+#include "engine.h"
+#include "config.h"
+
 #include "enca.h"
+#ifdef RCC_ENCA_DYNAMIC
+# include "fake_enca.h"
+#endif /* RCC_ENCA_DYNAMIC */
+
+static rcc_library_handle enca_handle = NULL;
+static rcc_engine *enca_engines = NULL;
+
+rcc_engine_internal rccEncaInitContext(rcc_engine_context ctx) {
+#ifdef RCC_ENCA_SUPPORT
+    EncaAnalyser enca;
+    
+    if ((!ctx)||(!ctx->language)) return NULL;
+    
+    enca = enca_analyser_alloc(ctx->language->sn);    
+    if (!enca) return NULL;
+
+    enca_set_threshold(enca, 1);
+    enca_set_multibyte(enca, 1);
+    enca_set_ambiguity(enca, 1);
+    enca_set_garbage_test(enca, 0);
+    enca_set_filtering(enca, 0);
+    enca_set_significant(enca,1);
+    enca_set_termination_strictness(enca,0);
+    
+    return (rcc_engine_internal)enca;
+#else /* RCC_ENCA_SUPPORT */
+    return NULL;
+#endif /* RCC_ENCA_SUPPORT */
+}
+
+void rccEncaFreeContext(rcc_engine_context ctx) {
+    rcc_engine_internal internal;
+#ifdef RCC_ENCA_SUPPORT
+    internal = rccEngineGetInternal(ctx);
+    if (internal)
+	enca_analyser_free(internal);
+#endif /* RCC_ENCA_SUPPORT */
+}
+
+rcc_charset_id rccEnca(rcc_engine_context ctx, char *buf, int len) {
+#ifdef RCC_ENCA_SUPPORT
+    rcc_engine_internal internal;
+    const char *charset;
+    EncaEncoding ee;
+
+    internal = rccEngineGetInternal(ctx);
+    if ((!internal)||(!buf)) return -1;
+    
+    
+    len = STRLEN(buf, len);
+
+    ee = enca_analyse_const((EncaAnalyser)ctx->internal,buf,len);
+    if (ee.charset<0) return -1;
+
+    charset = enca_charset_name(ee.charset, ENCA_NAME_STYLE_ICONV);
+    return rccGetAutoCharsetByName(ctx->ctx, charset);
+#else /* RCC_ENCA_SUPPORT */
+    return -1;
+#endif /* RCC_ENCA_SUPPORT */
+}
 
 rcc_engine rcc_enca_engine = {
     "Enca Library", &rccEncaInitContext, &rccEncaFreeContext, &rccEnca, {"UTF-8", NULL}
 };
 
-static rcc_library_handle enca_handle = NULL;
-static rcc_engine enca_engines[sizeof(rcc_default_languages)/sizeof(rcc_language)]; 
-
 
 static int rccEncaLibraryLoad() {
 #ifdef RCC_ENCA_DYNAMIC
     if (enca_handle) return 0;
     
-    enca_handle = rccLibraryLoad(RCC_ENCA_LIB);
+    enca_handle = rccLibraryOpen(RCC_ENCA_LIB);
     if (!enca_handle) return -1;
 
     enca_set_multibyte=rccLibraryFind(enca_handle,"enca_set_multibyte");
@@ -59,34 +118,38 @@ static void rccEncaLibraryUnload() {
 #endif /* RCC_ENCA_DYNAMIC */
 }
 
-
 int rccEncaInit() {
     int err;
     unsigned int i,j,k,l;
 
-    rcc_engine_list engines;
+    rcc_engine **engines;
     
     int *charsets;
-    size_t ncharsets;
+    size_t n_charsets;
 
 #ifdef RCC_ENCA_SUPPORT
+    if (enca_engines) return -1;
+    for (i=0;rcc_default_languages[i].sn;i++);
+    enca_engines = (rcc_engine*)malloc(i*sizeof(rcc_engine));
+    if (!enca_engines) return -1;
+
     err = rccEncaLibraryLoad();
     if (err) return err;
 
-    for (i=0;rcc_default_languages[i];i++) {
+    for (i=0;rcc_default_languages[i].sn;i++) {
 	engines = rcc_default_languages[i].engines;
 	for (j=0;engines[j];j++)
 	if (j >= RCC_MAX_ENGINES) continue;
 	
-	charsets = enca_get_language_charsets(rcc_default_languages[i].sn, &ncharsets);
+	charsets = enca_get_language_charsets(rcc_default_languages[i].sn, &n_charsets);
 	if (charsets) {
 	    memcpy(enca_engines+i, &rcc_enca_engine, sizeof(rcc_engine));
 	    for (k=0;enca_engines[i].charsets[k];k++);
 	    if (n_charsets+k>=RCC_MAX_CHARSETS) n_charsets = RCC_MAX_CHARSETS-k;
 	    
 	    for (l=0;l<n_charsets;l++)
-		enca_engines[j].charset[k++] = enca_charset_name(charsets[l], ENCA_NAME_STYLE_ICONV);
-	    enca_engines[j].charset[k] = NULL;
+		enca_engines[j].charsets[k++] = enca_charset_name(charsets[l], ENCA_NAME_STYLE_ICONV);
+	    enca_engines[j].charsets[k] = NULL;
 
 	    engines[j] = enca_engines + i;
 	    engines[j+1] = NULL;
@@ -102,60 +165,9 @@ int rccEncaInit() {
 void rccEncaFree() {
 #ifdef RCC_ENCA_SUPPORT
     rccEncaLibraryUnload();
+    if (enca_engines) {
+	free(enca_engines);
+	enca_engines = NULL;
+    }
 #endif /* RCC_ENCA_SUPPORT */
 }			    
-
-
-rcc_engine_internal rccEncaInitContext(rcc_engine_context *ctx) {
-#ifdef RCC_ENCA_SUPPORT
-    EncaAnalyser enca;
-    
-    if ((!ctx)||(!ctx->language)) return NULL;
-    
-    enca = enca_analyser_alloc(ctx->lanuage->sn);    
-    if (!enca) return NULL;
-
-    enca_set_threshold(enca, 1);
-    enca_set_multibyte(enca, 1);
-    enca_set_ambiguity(enca, 1);
-    enca_set_garbage_test(enca, 0);
-    enca_set_filtering(enca, 0);
-    enca_set_significant(enca,1);
-    enca_set_termination_strictness(enca,0);
-    
-    return (rcc_engine_internal)enca;
-#else /* RCC_ENCA_SUPPORT */
-    return NULL;
-#endif /* RCC_ENCA_SUPPORT */
-}
-
-void rccEncaFreeContext(rcc_engine_context ctx) {
-    rcc_engine_internal internal;
-#ifdef RCC_ENCA_SUPPORT
-    internal = rccEngineGetInternal(ctx);
-    if (internal)
-	enca_analyser_free(internal);
-#endif /* RCC_ENCA_SUPPORT */
-}
-
-rcc_charset_id rccEnca(rcc_engine_context ctx, char *buf, int len) {
-#ifdef RCC_ENCA_SUPPORT
-    rcc_engine_internal internal;
-    const char *charset;
-    EncaEncoding ee;
-
-    internal = rccEngineGetInternal(ctx);
-    if ((!internal)||(!buf)) return -1;
-    
-    
-    len = STRLEN(buf, len);
-
-    ee = enca_analyse_const((EncaAnalyser)ctx->internal,buf,len);
-    if (ee.charset<0) return -1;
-
-    charset = enca_charset_name(ee.charset, ENCA_NAME_STYLE_ICONV);
-    return rccGetAutoCharsetByName(ctx->ctx, charset);
-#else /* RCC_ENCA_SUPPORT */
-    return -1;
-#endif /* RCC_ENCA_SUPPORT */
-}