Commit 6d9b3383 authored by Jean-Philippe Andre's avatar Jean-Philippe Andre

Zip: use !/ as separator instead of |

As advised on the forum, !/ is the standard separator for JAR protocol.
parent 2c113555
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
#define ZIP_FILENAME_LEN 512 #define ZIP_FILENAME_LEN 512
#define ZIP_BUFFER_LEN 32768 #define ZIP_BUFFER_LEN 32768
#define ZIP_SEP "|" #define ZIP_SEP "!/"
#define ZIP_SEP_CHAR '|' #define ZIP_SEP_LEN 2
/** ************************************************************************** /** **************************************************************************
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
*****************************************************************************/ *****************************************************************************/
/** @todo: /** @todo:
* - implement crypto (using url zip://user:password@path-to-archive|file * - implement crypto (using url zip://user:password@path-to-archive!/file)
* - read files in zip with long name (use unz_file_info.size_filename) * - read files in zip with long name (use unz_file_info.size_filename)
* - multi-volume archive support ? * - multi-volume archive support ?
*/ */
...@@ -112,9 +112,12 @@ int AccessOpen( vlc_object_t *p_this ) ...@@ -112,9 +112,12 @@ int AccessOpen( vlc_object_t *p_this )
/* Split the MRL */ /* Split the MRL */
psz_path = strdup( p_access->psz_path ); psz_path = strdup( p_access->psz_path );
psz_sep = strchr( psz_path, ZIP_SEP_CHAR ); psz_sep = strstr( psz_path, ZIP_SEP );
if( !psz_sep ) if( !psz_sep )
{
msg_Dbg( p_access, "path does not contain separator " ZIP_SEP );
return VLC_EGENERIC; return VLC_EGENERIC;
}
*psz_sep = '\0'; *psz_sep = '\0';
psz_pathToZip = unescapeXml( psz_path ); psz_pathToZip = unescapeXml( psz_path );
...@@ -125,10 +128,10 @@ int AccessOpen( vlc_object_t *p_this ) ...@@ -125,10 +128,10 @@ int AccessOpen( vlc_object_t *p_this )
psz_path ); psz_path );
psz_pathToZip = strdup( psz_path ); psz_pathToZip = strdup( psz_path );
} }
p_sys->psz_fileInzip = unescapeXml( psz_sep + 1 ); p_sys->psz_fileInzip = unescapeXml( psz_sep + ZIP_SEP_LEN );
if( !p_sys->psz_fileInzip ) if( !p_sys->psz_fileInzip )
{ {
p_sys->psz_fileInzip = strdup( psz_sep + 1 ); p_sys->psz_fileInzip = strdup( psz_sep + ZIP_SEP_LEN );
} }
/* Define IO functions */ /* Define IO functions */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment