1 files changed, 16 insertions, 8 deletions
diff --git a/src/input/mms.c b/src/input/mms.c
index f11a89cf3..b2d00a46e 100644
--- a/src/input/mms.c
+++ b/src/input/mms.c
@@ -202,9 +202,9 @@ static void mms_buffer_put_64 (mms_buffer_t *mms_buffer, uint64_t value) {
 }
 
 
+#ifdef LOG
 static void print_command (char *data, int len) {
 
-#ifdef LOG
   int i;
   int dir = _X_LE_32 (data + 36) >> 16;
   int comm = _X_LE_32 (data + 36) & 0xFFFF;
@@ -240,8 +240,10 @@ static void print_command (char *data, int len) {
   if (len > CMD_HEADER_LEN)
     printf ("\n");
   printf ("----------------------------------------------\n");
+}
+#else
+# define print_command(data, len)
 #endif
-}  
 
 
 
@@ -288,7 +290,7 @@ static int send_command (mms_t *this, int command,
 
 #ifdef USE_ICONV
 static iconv_t string_utf16_open() {
-    return iconv_open("UTF-16LE", nl_langinfo(CODESET));
+    return iconv_open("UTF-16LE", "UTF-8");
 }
 
 static void string_utf16_close(iconv_t url_conv) {
@@ -678,7 +680,7 @@ mms_t *mms_connect (xine_stream_t *stream, const char *url, int bandwidth) {
   if (!url)
     return NULL;
 
-  this = (mms_t*) xine_xmalloc (sizeof (mms_t));
+  this = calloc(1, sizeof (mms_t));
 
   this->stream          = stream;
   this->url             = strdup (url);
@@ -769,12 +771,17 @@ mms_t *mms_connect (xine_stream_t *stream, const char *url, int bandwidth) {
   /* command 0x5 */
   {
     mms_buffer_t command_buffer;
-    char *path;
-    int pathlen;
+    char *path, *unescaped;
+    size_t pathlen;
+
+    unescaped = strdup (this->uri);
+    if (!unescaped)
+      goto fail;
+    _x_mrl_unescape (unescaped);
 
     /* remove the first '/' */
-    path = this->uri;
-    pathlen = strlen(path);
+    path = unescaped;
+    pathlen = strlen (path);
     if (pathlen > 1) {
       path++;
       pathlen--;
@@ -785,6 +792,7 @@ mms_t *mms_connect (xine_stream_t *stream, const char *url, int bandwidth) {
     mms_buffer_put_32 (&command_buffer, 0x00000000); /* ?? */
     mms_buffer_put_32 (&command_buffer, 0x00000000); /* ?? */
     string_utf16 (url_conv, this->scmd_body + command_buffer.pos, path, pathlen);
+    free (unescaped);
     if (!send_command (this, 5, 1, 0xffffffff, pathlen * 2 + 12))
       goto fail;
   }