Changeset 745 for trunk/server/source3/lib/util_unistr.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)
• source3/lib/util_unistr.c (modified) (9 diffs)

trunk/server/source3/lib/util_unistr.c

@@ -22 +22 @@
 #include "includes.h"
 
-#ifndef MAXUNI
-#define MAXUNI 1024
-#endif
-
 /* these 3 tables define the unicode case handling.  They are loaded
    at startup either via mmap() or read() from the lib directory */
-static smb_ucs2_t *upcase_table;
-static smb_ucs2_t *lowcase_table;
 static uint8 *valid_table;
-static bool upcase_table_use_unmap;
-static bool lowcase_table_use_unmap;
-static bool valid_table_use_unmap;
 static bool initialized;
 
@@ -41 +32 @@
 void gfree_case_tables(void)
 {
-        if ( upcase_table ) {
-                if ( upcase_table_use_unmap )
-                        unmap_file(upcase_table, 0x20000);
-                else
-                        SAFE_FREE(upcase_table);
-        }
-
-        if ( lowcase_table ) {
-                if ( lowcase_table_use_unmap )
-                        unmap_file(lowcase_table, 0x20000);
-                else
-                        SAFE_FREE(lowcase_table);
-        }
-
         if ( valid_table ) {
-                if ( valid_table_use_unmap )
-                        unmap_file(valid_table, 0x10000);
-                else
-                        SAFE_FREE(valid_table);
+                unmap_file(valid_table, 0x10000);
+                valid_table = NULL;
         }
         initialized = false;
-}
-
-/**
- * Load or generate the case handling tables.
- *
- * The case tables are defined in UCS2 and don't depend on any
- * configured parameters, so they never need to be reloaded.
- **/
-
-void load_case_tables(void)
-{
-        char *old_locale = NULL, *saved_locale = NULL;
-        int i;
-        TALLOC_CTX *frame = NULL;
-
-        if (initialized) {
-                return;
-        }
-        initialized = true;
-
-        frame = talloc_stackframe();
-
-        upcase_table = (smb_ucs2_t *)map_file(data_path("upcase.dat"),
-                                              0x20000);
-        upcase_table_use_unmap = ( upcase_table != NULL );
-
-        lowcase_table = (smb_ucs2_t *)map_file(data_path("lowcase.dat"),
-                                               0x20000);
-        lowcase_table_use_unmap = ( lowcase_table != NULL );
-
-#ifdef HAVE_SETLOCALE
-        /* Get the name of the current locale.  */
-        old_locale = setlocale(LC_ALL, NULL);
-
-        if (old_locale) {
-                /* Save it as it is in static storage. */
-                saved_locale = SMB_STRDUP(old_locale);
-        }
-
-        /* We set back the locale to C to get ASCII-compatible toupper/lower functions. */
-        setlocale(LC_ALL, "C");
-#endif
-
-        /* we would like Samba to limp along even if these tables are
-           not available */
-        if (!upcase_table) {
-                DEBUG(1,("creating lame upcase table\n"));
-                upcase_table = (smb_ucs2_t *)SMB_MALLOC(0x20000);
-                for (i=0;i<0x10000;i++) {
-                        smb_ucs2_t v;
-                        SSVAL(&v, 0, i);
-                        upcase_table[v] = i;
-                }
-                for (i=0;i<256;i++) {
-                        smb_ucs2_t v;
-                        SSVAL(&v, 0, UCS2_CHAR(i));
-                        upcase_table[v] = UCS2_CHAR(islower(i)?toupper(i):i);
-                }
-        }
-
-        if (!lowcase_table) {
-                DEBUG(1,("creating lame lowcase table\n"));
-                lowcase_table = (smb_ucs2_t *)SMB_MALLOC(0x20000);
-                for (i=0;i<0x10000;i++) {
-                        smb_ucs2_t v;
-                        SSVAL(&v, 0, i);
-                        lowcase_table[v] = i;
-                }
-                for (i=0;i<256;i++) {
-                        smb_ucs2_t v;
-                        SSVAL(&v, 0, UCS2_CHAR(i));
-                        lowcase_table[v] = UCS2_CHAR(isupper(i)?tolower(i):i);
-                }
-        }
-
-#ifdef HAVE_SETLOCALE
-        /* Restore the old locale. */
-        if (saved_locale) {
-                setlocale (LC_ALL, saved_locale);
-                SAFE_FREE(saved_locale);
-        }
-#endif
-        TALLOC_FREE(frame);
-}
-
-static int check_dos_char_slowly(smb_ucs2_t c)
-{
-        char buf[10];
-        smb_ucs2_t c2 = 0;
-        int len1, len2;
-
-        len1 = convert_string(CH_UTF16LE, CH_DOS, &c, 2, buf, sizeof(buf),False);
-        if (len1 == 0) {
-                return 0;
-        }
-        len2 = convert_string(CH_DOS, CH_UTF16LE, buf, len1, &c2, 2,False);
-        if (len2 != 2) {
-                return 0;
-        }
-        return (c == c2);
 }
 
@@ -173 +48 @@
  **/
 
-void init_valid_table(void)
-{
-        static int mapped_file;
-        int i;
-        const char *allowed = ".!#$%&'()_-@^`~";
-        uint8 *valid_file;
-
-        if (mapped_file) {
-                /* Can't unmap files, so stick with what we have */
+static void init_valid_table(void)
+{
+        if (valid_table) {
                 return;
         }
 
-        valid_file = (uint8 *)map_file(data_path("valid.dat"), 0x10000);
-        if (valid_file) {
-                valid_table = valid_file;
-                mapped_file = 1;
-                valid_table_use_unmap = True;
+        valid_table = (uint8 *)map_file(data_path("valid.dat"), 0x10000);
+        if (!valid_table) {
+                smb_panic("Could not load valid.dat file required for mangle method=hash");
                 return;
-        }
-
-        /* Otherwise, we're using a dynamically created valid_table.
-         * It might need to be regenerated if the code page changed.
-         * We know that we're not using a mapped file, so we can
-         * free() the old one. */
-        SAFE_FREE(valid_table);
-
-        /* use free rather than unmap */
-        valid_table_use_unmap = False;
-
-        DEBUG(2,("creating default valid table\n"));
-        valid_table = (uint8 *)SMB_MALLOC(0x10000);
-        SMB_ASSERT(valid_table != NULL);
-        for (i=0;i<128;i++) {
-                valid_table[i] = isalnum(i) || strchr(allowed,i);
-        }
-
-        lazy_initialize_conv();
-
-        for (;i<0x10000;i++) {
-                smb_ucs2_t c;
-                SSVAL(&c, 0, i);
-                valid_table[i] = check_dos_char_slowly(c);
         }
 }
@@ -236 +79 @@
 }
 
-
-/*******************************************************************
- Skip past a unicode string, but not more than len. Always move
- past a terminating zero if found.
-********************************************************************/
-
-char *skip_unibuf(char *src, size_t len)
-{
-        char *srcend = src + len;
-
-        while (src < srcend && SVAL(src,0)) {
-                src += 2;
-        }
-
-        if(!SVAL(src,0)) {
-                src += 2;
-        }
-
-        return src;
-}
 
 /* Converts a string from internal samba format to unicode
@@ -279 +102 @@
 
 /*******************************************************************
- Convert a wchar to upper case.
-********************************************************************/
-
-smb_ucs2_t toupper_w(smb_ucs2_t val)
-{
-        return upcase_table[SVAL(&val,0)];
-}
-
-/*******************************************************************
- Convert a wchar to lower case.
-********************************************************************/
-
-smb_ucs2_t tolower_w( smb_ucs2_t val )
-{
-        return lowcase_table[SVAL(&val,0)];
-}
-
-/*******************************************************************
- Determine if a character is lowercase.
-********************************************************************/
-
-bool islower_w(smb_ucs2_t c)
-{
-        return upcase_table[SVAL(&c,0)] != c;
-}
-
-/*******************************************************************
- Determine if a character is uppercase.
-********************************************************************/
-
-bool isupper_w(smb_ucs2_t c)
-{
-        return lowcase_table[SVAL(&c,0)] != c;
-}
-
-/*******************************************************************
  Determine if a character is valid in a 8.3 name.
 ********************************************************************/
@@ -320 +107 @@
 bool isvalid83_w(smb_ucs2_t c)
 {
+        init_valid_table();
         return valid_table[SVAL(&c,0)] != 0;
 }
@@ -457 +245 @@
  Convert a string to lower case.
  return True if any char is converted
+
+ This is unsafe for any string involving a UTF16 character
 ********************************************************************/
 
@@ -478 +268 @@
  Convert a string to upper case.
  return True if any char is converted
+
+ This is unsafe for any string involving a UTF16 character
 ********************************************************************/
 
@@ -816 +608 @@
 }
 
-/*************************************************************
- ascii only toupper - saves the need for smbd to be in C locale.
-*************************************************************/
-
-int toupper_ascii(int c)
-{
-        smb_ucs2_t uc = toupper_w(UCS2_CHAR(c));
-        return UCS2_TO_CHAR(uc);
-}
-
-/*************************************************************
- ascii only tolower - saves the need for smbd to be in C locale.
-*************************************************************/
-
-int tolower_ascii(int c)
-{
-        smb_ucs2_t uc = tolower_w(UCS2_CHAR(c));
-        return UCS2_TO_CHAR(uc);
-}
-
-/*************************************************************
- ascii only isupper - saves the need for smbd to be in C locale.
-*************************************************************/
-
-int isupper_ascii(int c)
-{
-        return isupper_w(UCS2_CHAR(c));
-}
-
-/*************************************************************
- ascii only islower - saves the need for smbd to be in C locale.
-*************************************************************/
-
-int islower_ascii(int c)
-{
-        return islower_w(UCS2_CHAR(c));
-}
+smb_ucs2_t toupper_w(smb_ucs2_t v)
+{
+        smb_ucs2_t ret;
+        /* LE to native. */
+        codepoint_t cp = SVAL(&v,0);
+        cp = toupper_m(cp);
+        /* native to LE. */
+        SSVAL(&ret,0,cp);
+        return ret;
+}
+
+bool isupper_w(smb_ucs2_t v)
+{
+        codepoint_t cp = SVAL(&v,0);
+        return isupper_m(cp);
+}
+
+smb_ucs2_t tolower_w(smb_ucs2_t v)
+{
+        smb_ucs2_t ret;
+        /* LE to native. */
+        codepoint_t cp = SVAL(&v,0);
+        cp = tolower_m(cp);
+        /* native to LE. */
+        SSVAL(&ret,0,cp);
+        return ret;
+}
+
+bool islower_w(smb_ucs2_t v)
+{
+        codepoint_t cp = SVAL(&v,0);
+        return islower_m(cp);
+}