[Mplayer-cvslog] CVS: main m_option.c,1.14,1.15

[Alban Bedel CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv25879

Modified Files:
	m_option.c 
Log Message:
Fix a 10l and add escaped filename support. Needed by ftp.


Index: m_option.c
===================================================================
RCS file: /cvsroot/mplayer/main/m_option.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- m_option.c	9 Jul 2003 01:29:44 -0000	1.14
+++ m_option.c	13 Aug 2003 12:09:25 -0000	1.15
@@ -1672,6 +1672,8 @@
 	}
       }
     }
+    ptr1 = ptr2+1;
+    pos1 = ptr1-url;
   }
 
   // before looking for a port number check if we have an IPv6 type numeric address
@@ -1752,7 +1754,15 @@
 	// skip
       } else {
 	if(dst) {
-	  r = m_struct_set(desc,dst,"filename",ptr2+1);
+	  int l = strlen(ptr2+1) + 1;
+	  char* fname = ptr2+1;
+	  if(l > 1) {
+	    fname = malloc(l);
+	    url_unescape_string(fname,ptr2+1);
+	  }
+	  r = m_struct_set(desc,dst,"filename",fname);
+	  if(fname != ptr2+1)
+	    free(fname);
 	  if(r < 0) {
 	    mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: error while setting filename\n",name);
 	    return r;