Changeset 43173 in vbox

Timestamp:

Sep 4, 2012 5:31:56 PM (12 years ago)

Author:

vboxsync

Message:

Linux GA: Shared Folders: fix default NLS table loading issue.

File:

• trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

@@ -107 +107 @@
     memcpy(str_name->String.utf8, info->name, name_len + 1);
 
-    if (info->nls_name[0] && strcmp(info->nls_name, "utf8"))
+/* Check if NLS charset is valid and not points to UTF8 table */
+#define VFSMOD_HAS_NLS(_name) \
+    (_name[0] && strcmp(_name, "utf8"))
+    if (VFSMOD_HAS_NLS(info->nls_name))
     {
         sf_g->nls = load_nls(info->nls_name);
@@ -118 +121 @@
     }
     else
+    {
         /* If no NLS charset specified, try to load the default one */
-        sf_g->nls = load_nls_default();
+        if (VFSMOD_HAS_NLS(CONFIG_NLS_DEFAULT))
+            sf_g->nls = load_nls_default();
+        else
+            sf_g->nls = NULL;
+    }
+#undef VFSMOD_HAS_NLS
 
     rc = vboxCallMapFolder(&client_handle, str_name, &sf_g->map);