Changeset 745 for trunk/server/lib/util/charset/iconv.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/util/charset/iconv.c (modified) (10 diffs)

trunk/server/lib/util/charset/iconv.c

@@ -24 +24 @@
 #include "system/filesys.h"
 
+#ifdef strcasecmp
+#undef strcasecmp
+#endif
+
+#ifdef static_decl_charset
+static_decl_charset;
+#endif
 
 /**
@@ -50 +57 @@
 static size_t ascii_pull  (void *,const char **, size_t *, char **, size_t *);
 static size_t ascii_push  (void *,const char **, size_t *, char **, size_t *);
+static size_t latin1_push(void *,const char **, size_t *, char **, size_t *);
 static size_t utf8_pull   (void *,const char **, size_t *, char **, size_t *);
 static size_t utf8_push   (void *,const char **, size_t *, char **, size_t *);
@@ -73 +81 @@
 
         {"ASCII", ascii_pull, ascii_push},
+        {"646", ascii_pull, ascii_push},
+        {"ISO-8859-1", ascii_pull, latin1_push},
         {"UCS2-HEX", ucs2hex_pull, ucs2hex_push}
 };
@@ -78 +88 @@
 static struct charset_functions *charsets = NULL;
 
-bool charset_register_backend(const void *_funcs) 
-{
-        struct charset_functions *funcs = (struct charset_functions *)memdup(_funcs,sizeof(struct charset_functions));
+static struct charset_functions *find_charset_functions(const char *name)
+{
         struct charset_functions *c;
 
         /* Check whether we already have this charset... */
         for (c = charsets; c != NULL; c = c->next) {
-                if(!strcasecmp(c->name, funcs->name)) { 
-                        DEBUG(2, ("Duplicate charset %s, not registering\n", funcs->name));
-                        return false;
-                }
-        }
+                if(strcasecmp(c->name, name) == 0) { 
+                        return c;
+                }
+//              c = c->next;
+        }
+
+        return NULL;
+}
+
+bool smb_register_charset(const struct charset_functions *funcs_in)
+{
+        struct charset_functions *funcs;
+
+        DEBUG(5, ("Attempting to register new charset %s\n", funcs_in->name));
+        /* Check whether we already have this charset... */
+        if (find_charset_functions(funcs_in->name)) {
+                DEBUG(0, ("Duplicate charset %s, not registering\n", funcs_in->name));
+                return false;
+        }
+
+        funcs = talloc(NULL, struct charset_functions);
+        if (!funcs) {
+                DEBUG(0, ("Out of memory duplicating charset %s\n", funcs_in->name));
+                return false;
+        }
+        *funcs = *funcs_in;
 
         funcs->next = funcs->prev = NULL;
+        DEBUG(5, ("Registered charset %s\n", funcs->name));
         DLIST_ADD(charsets, funcs);
         return true;
 }
+
+static void lazy_initialize_iconv(void)
+{
+        static bool initialized;
+
+#ifdef static_init_charset
+        if (!initialized) {
+                static_init_charset;
+                initialized = true;
+        }
+#endif
+}
+
+#if defined(__OS2__) && defined(__INNOTEK_LIBC__)
+#include <uconv.h>
+
+typedef struct os2_iconv_t
+{
+    UconvObject from;
+} os2_iconv_t;
+
+iconv_t os2_iconv_open (const char *tocode, const char *fromcode)
+{
+    os2_iconv_t *os2_cd = (os2_iconv_t *)iconv_open(tocode, fromcode);
+
+    if (os2_cd != (iconv_t)(-1))
+       {
+        /* Assume strings contain pathnames */
+        uconv_attribute_t attr;
+
+        UniQueryUconvObject(os2_cd->from, &attr,
+                            sizeof(uconv_attribute_t),
+                            NULL, NULL, NULL );
+        attr.converttype |= CVTTYPE_PATH;
+        UniSetUconvObject(os2_cd->from, &attr);
+        }
+
+    return (iconv_t)os2_cd;
+}
+
+#define iconv_open  os2_iconv_open
+#endif
 
 #ifdef HAVE_NATIVE_ICONV
@@ -159 +232 @@
 }
 
-int smb_iconv_t_destructor(smb_iconv_t hwd)
-{ 
+static int smb_iconv_t_destructor(smb_iconv_t hwd)
+{
 #ifdef HAVE_NATIVE_ICONV
         if (hwd->cd_pull != NULL && hwd->cd_pull != (iconv_t)-1)
@@ -180 +253 @@
         int i;
 
+        lazy_initialize_iconv();
+
         ret = (smb_iconv_t)talloc_named(mem_ctx,
                                         sizeof(*ret), 
@@ -261 +336 @@
         if (is_utf16(tocode)) {
                 ret->direct = sys_iconv;
-                /* could be set just above - so we need to close iconv */
-                if (ret->cd_direct != NULL && ret->cd_direct != (iconv_t)-1)
-                        iconv_close(ret->cd_direct);
                 ret->cd_direct = ret->cd_pull;
                 ret->cd_pull = NULL;
@@ -286 +358 @@
 _PUBLIC_ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
 {
-        return smb_iconv_open_ex(talloc_autofree_context(), tocode, fromcode, true);
+        return smb_iconv_open_ex(NULL, tocode, fromcode, true);
 }
 
@@ -351 +423 @@
 }
 
+static size_t latin1_push(void *cd, const char **inbuf, size_t *inbytesleft,
+                         char **outbuf, size_t *outbytesleft)
+{
+        int ir_count=0;
+
+        while (*inbytesleft >= 2 && *outbytesleft >= 1) {
+                (*outbuf)[0] = (*inbuf)[0];
+                if ((*inbuf)[1]) ir_count++;
+                (*inbytesleft)  -= 2;
+                (*outbytesleft) -= 1;
+                (*inbuf)  += 2;
+                (*outbuf) += 1;
+        }
+
+        if (*inbytesleft == 1) {
+                errno = EINVAL;
+                return -1;
+        }
+
+        if (*inbytesleft > 1) {
+                errno = E2BIG;
+                return -1;
+        }
+
+        return ir_count;
+}
 
 static size_t ucs2hex_pull(void *cd, const char **inbuf, size_t *inbytesleft,
@@ -356 +454 @@
 {
         while (*inbytesleft >= 1 && *outbytesleft >= 2) {
-                uint_t v;
+                unsigned int v;
 
                 if ((*inbuf)[0] != '@') {