Changeset 1052

Timestamp:

Jan 25, 2018, 11:51:10 AM (8 years ago)

Author:

Silvan Scherrer

Message:

fix umlaut issues in pathnames ticket #319

File:

• trunk/server/lib/util/charset/codepoints.c (modified) (5 diffs)

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

@@ -169 +169 @@
         if (global_iconv_convenience == NULL)
                 global_iconv_convenience = smb_iconv_convenience_reinit(talloc_autofree_context(),
+#ifdef __OS2__
+                        lp_dos_charset(), lp_unix_charset(), lp_display_charset(), true, NULL);
+#else
                                                                         "ASCII", "UTF-8", "ASCII", true, NULL);
+#endif
         return global_iconv_convenience;
 }
@@ -354 +358 @@
         smb_iconv_t descriptor;
         size_t ilen_orig;
+#ifdef __OS2__
+        size_t ilen_max;
+        size_t olen_orig;
+        const char *inbuf;
+#endif
         size_t ilen;
         size_t olen;
@@ -368 +377 @@
          */
         ilen_orig = strnlen(str, 5);
+#ifdef __OS2__
+        ilen_max = strnlen(str, 5);
+        *bytes_consumed = 1;
+#endif
         ilen = ilen_orig;
 
@@ -376 +389 @@
         }
 
+#ifdef __OS2__
+        ilen_orig = 1;
+        olen_orig = 2;
+        while( 1 )
+        {
+                ilen = ilen_orig;
+                olen = olen_orig;
+                inbuf = str;
+                outbuf = ( char * )buf;
+                if( smb_iconv( descriptor, &inbuf, &ilen, &outbuf, &olen ) != ( size_t )-1 )
+                        break;
+
+                switch( errno )
+                {
+                        case E2BIG :
+                                if( olen_orig == 2 )
+                                        olen_orig = 4;
+                                else
+                                        return INVALID_CODEPOINT;
+                                break;
+
+
+                        case EINVAL :
+                                if( ilen_orig < ilen_max )
+                                        ilen_orig++;
+                                else
+                                        return INVALID_CODEPOINT;
+                                break;
+
+                        case EILSEQ :
+                        default :
+                                return INVALID_CODEPOINT;
+                }
+        }
+        olen = olen_orig - olen;
+#else
         /*
          * this looks a little strange, but it is needed to cope with
@@ -396 +445 @@
                 olen = 2 - olen;
         }
+#endif
 
         *bytes_consumed = ilen_orig - ilen;