Changeset 21014 in vbox for trunk/src/VBox/Additions/linux/sharedfolders/utils.c

Timestamp:

Jun 29, 2009 7:30:00 AM (15 years ago)

Author:

vboxsync

Message:

Linux shared folders: Linux 2.6.31 fixes

File:

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

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

@@ -470 +470 @@
                         in += nb;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 31)
+                        nb = utf32_to_utf8 (uni, out, out_bound_len);
+#else
                         nb = utf8_wctomb (out, uni, out_bound_len);
+#endif
                         if (nb < 0) {
                                 LogFunc(("nls->uni2char failed %x %d\n",
@@ -528 +532 @@
                         wchar_t uni;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 31)
+                        nb = utf8_to_utf32 (in, in_bound_len, &uni);
+#else
                         nb = utf8_mbtowc (&uni, in, in_bound_len);
+#endif
                         if (nb < 0) {
                                 LogFunc(("utf8_mbtowc failed(%s) %x:%d\n",