X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftext%2Fstrings.c;h=a37fe165ead0f408ac1f694240d81a0f4fdc7c45;hb=9ae7d4e604370f2dec236494c48bc33b685a014b;hp=9c6d9315e107c8912cd06ce99bbb701d9319313d;hpb=272817e4e8be36e209ea64e5de1784f951bc8ebb;p=vlc diff --git a/src/text/strings.c b/src/text/strings.c index 9c6d9315e1..a37fe165ea 100644 --- a/src/text/strings.c +++ b/src/text/strings.c @@ -48,89 +48,6 @@ #include #include -/** - * Unescape URI encoded string - * \return decoded duplicated string - */ -char *unescape_URI_duplicate( const char *psz ) -{ - char *psz_dup = strdup( psz ); - unescape_URI( psz_dup ); - return psz_dup; -} - -/** - * Unescape URI encoded string in place - * \return nothing - */ -void unescape_URI( char *psz ) -{ - unsigned char *in = (unsigned char *)psz, *out = in, c; - if( psz == NULL ) - return; - - while( ( c = *in++ ) != '\0' ) - { - switch( c ) - { - case '%': - { - char val[5], *pval = val; - unsigned long cp; - - switch( c = *in++ ) - { - case '\0': - return; - - case 'u': - case 'U': - if( ( *pval++ = *in++ ) == '\0' ) - return; - if( ( *pval++ = *in++ ) == '\0' ) - return; - c = *in++; - - default: - *pval++ = c; - if( ( *pval++ = *in++ ) == '\0' ) - return; - *pval = '\0'; - } - - cp = strtoul( val, NULL, 0x10 ); - if( cp < 0x80 ) - *out++ = cp; - else - if( cp < 0x800 ) - { - *out++ = (( cp >> 6) | 0xc0); - *out++ = (( cp & 0x3f) | 0x80); - } - else - { - assert( cp < 0x10000 ); - *out++ = (( cp >> 12) | 0xe0); - *out++ = (((cp >> 6) & 0x3f) | 0x80); - *out++ = (( cp & 0x3f) | 0x80); - } - break; - } - - /* + is not a special case - it means plus, not space. */ - - default: - /* Inserting non-ASCII or non-printable characters is unsafe, - * and no sane browser will send these unencoded */ - if( ( c < 32 ) || ( c > 127 ) ) - *out++ = '?'; - else - *out++ = c; - } - } - *out = '\0'; -} - /** * Decode encoded URI component. See also decode_URI(). * \return decoded duplicated string @@ -485,47 +402,36 @@ void resolve_xml_special_chars( char *psz_value ) */ char *convert_xml_special_chars( const char *psz_content ) { - char *psz_temp = malloc( 6 * strlen( psz_content ) + 1 ); - const char *p_from = psz_content; + assert( psz_content ); + + const size_t len = strlen( psz_content ); + char *const psz_temp = malloc( 6 * len + 1 ); char *p_to = psz_temp; - while ( *p_from ) + if( psz_temp == NULL ) + return NULL; + for( size_t i = 0; i < len; i++ ) { - if ( *p_from == '<' ) - { - strcpy( p_to, "<" ); - p_to += 4; - } - else if ( *p_from == '>' ) - { - strcpy( p_to, ">" ); - p_to += 4; - } - else if ( *p_from == '&' ) - { - strcpy( p_to, "&" ); - p_to += 5; - } - else if( *p_from == '\"' ) - { - strcpy( p_to, """ ); - p_to += 6; - } - else if( *p_from == '\'' ) - { - strcpy( p_to, "'" ); - p_to += 6; - } - else + const char *str; + char c = psz_content[i]; + + switch ( c ) { - *p_to = *p_from; - p_to++; + case '\"': str = "quot"; break; + case '&': str = "amp"; break; + case '\'': str = "#39"; break; + case '<': str = "lt"; break; + case '>': str = "gt"; break; + default: + *(p_to++) = c; + continue; } - p_from++; + p_to += sprintf( p_to, "&%s;", str ); } - *p_to = '\0'; + *(p_to++) = '\0'; - return psz_temp; + p_to = realloc( psz_temp, p_to - psz_temp ); + return p_to ? p_to : psz_temp; /* cannot fail */ } /* Base64 encoding */ @@ -700,7 +606,7 @@ char *str_format_time( const char *tformat ) if( string != NULL ) \ { \ int len = strlen( string ); \ - dst = realloc( dst, i_size = i_size + len );\ + dst = xrealloc( dst, i_size = i_size + len );\ memcpy( (dst+d), string, len ); \ d += len; \ free( string ); \ @@ -715,7 +621,7 @@ char *str_format_time( const char *tformat ) #define INSERT_STRING_NO_FREE( string ) \ { \ int len = strlen( string ); \ - dst = realloc( dst, i_size = i_size + len );\ + dst = xrealloc( dst, i_size = i_size + len );\ memcpy( dst+d, string, len ); \ d += len; \ } @@ -875,14 +781,14 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) if( p_item ) { mtime_t i_duration = input_item_GetDuration( p_item ); - sprintf( buf, "%02d:%02d:%02d", + snprintf( buf, 10, "%02d:%02d:%02d", (int)(i_duration/(3600000000)), (int)((i_duration/(60000000))%60), (int)((i_duration/1000000)%60) ); } else { - sprintf( buf, b_empty_if_na ? "" : "--:--:--" ); + snprintf( buf, 10, b_empty_if_na ? "" : "--:--:--" ); } INSERT_STRING_NO_FREE( buf ); break; @@ -908,15 +814,15 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) if( p_item && p_input ) { mtime_t i_duration = input_item_GetDuration( p_item ); - int64_t i_time = var_GetInteger( p_input, "time" ); - sprintf( buf, "%02d:%02d:%02d", + int64_t i_time = var_GetTime( p_input, "time" ); + snprintf( buf, 10, "%02d:%02d:%02d", (int)( ( i_duration - i_time ) / 3600000000 ), (int)( ( ( i_duration - i_time ) / 60000000 ) % 60 ), (int)( ( ( i_duration - i_time ) / 1000000 ) % 60 ) ); } else { - sprintf( buf, b_empty_if_na ? "" : "--:--:--" ); + snprintf( buf, 10, b_empty_if_na ? "" : "--:--:--" ); } INSERT_STRING_NO_FREE( buf ); break; @@ -945,15 +851,15 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) } else { - sprintf( buf, b_empty_if_na ? "" : "--.-%%" ); + snprintf( buf, 10, b_empty_if_na ? "" : "--.-%%" ); } INSERT_STRING_NO_FREE( buf ); break; case 'R': if( p_input ) { - int r = var_GetInteger( p_input, "rate" ); - snprintf( buf, 10, "%d.%d", r/1000, r%1000 ); + float f = var_GetFloat( p_input, "rate" ); + snprintf( buf, 10, "%.3f", f ); } else { @@ -976,15 +882,15 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) case 'T': if( p_input ) { - int64_t i_time = var_GetInteger( p_input, "time" ); - sprintf( buf, "%02d:%02d:%02d", + int64_t i_time = var_GetTime( p_input, "time" ); + snprintf( buf, 10, "%02d:%02d:%02d", (int)( i_time / ( 3600000000 ) ), (int)( ( i_time / ( 60000000 ) ) % 60 ), (int)( ( i_time / 1000000 ) % 60 ) ); } else { - sprintf( buf, b_empty_if_na ? "" : "--:--:--" ); + snprintf( buf, 10, b_empty_if_na ? "" : "--:--:--" ); } INSERT_STRING_NO_FREE( buf ); break; @@ -1141,12 +1047,18 @@ void path_sanitize( char *str ) #include /** - * Convert a file path to an URI. If already an URI, do nothing. + * Convert a file path to an URI. + * If already an URI, return a copy of the string. + * @path path path to convert (or URI to copy) + * @return a nul-terminated URI string (use free() to release it), + * or NULL in case of error */ char *make_URI (const char *path) { if (path == NULL) return NULL; + if (!strcmp (path, "-")) + return strdup ("fd://0"); // standard input if (strstr (path, "://") != NULL) return strdup (path); /* Already an URI */ /* Note: VLC cannot handle URI schemes without double slash after the @@ -1162,15 +1074,37 @@ char *make_URI (const char *path) } else #endif -#if 0 - /* Windows UNC paths (file://host/share/path instead of file:///path) */ if (!strncmp (path, "\\\\", 2)) - { - path += 2; - buf = strdup ("file://"); + { /* Windows UNC paths */ +#ifndef WIN32 + /* \\host\share\path -> smb://host/share/path */ + if (strchr (path + 2, '\\') != NULL) + { /* Convert antislashes to slashes */ + char *dup = strdup (path); + if (dup == NULL) + return NULL; + for (size_t i = 2; dup[i]; i++) + if (dup[i] == '\\') + dup[i] = DIR_SEP_CHAR; + + char *ret = make_URI (dup); + free (dup); + return ret; + } +# define SMB_SCHEME "smb" +#else + /* \\host\share\path -> file://host/share/path */ +# define SMB_SCHEME "file" +#endif + size_t hostlen = strcspn (path + 2, DIR_SEP); + + buf = malloc (sizeof (SMB_SCHEME) + 3 + hostlen); + if (buf != NULL) + snprintf (buf, sizeof (SMB_SCHEME) + 3 + hostlen, + SMB_SCHEME"://%s", path + 2); + path += 2 + hostlen; } else -#endif if (path[0] != DIR_SEP_CHAR) { /* Relative path: prepend the current working directory */ char cwd[PATH_MAX]; @@ -1212,3 +1146,93 @@ char *make_URI (const char *path) return buf; } } + +/** + * Tries to convert an URI to a local (UTF-8-encoded) file path. + * @param url URI to convert + * @return NULL on error, a nul-terminated string otherwise + * (use free() to release it) + */ +char *make_path (const char *url) +{ + char *ret = NULL; + char *end; + + char *path = strstr (url, "://"); + if (path == NULL) + return NULL; /* unsupported scheme or invalid syntax */ + + end = memchr (url, '/', path - url); + size_t schemelen = ((end != NULL) ? end : path) - url; + path += 3; /* skip "://" */ + + /* Remove HTML anchor if present */ + end = strchr (path, '#'); + if (end) + path = strndup (path, end - path); + else + path = strdup (path); + if (unlikely(path == NULL)) + return NULL; /* boom! */ + + /* Decode path */ + decode_URI (path); + + if (schemelen == 4 && !strncasecmp (url, "file", 4)) + { +#if (DIR_SEP_CHAR != '/') + for (char *p = strchr (path, '/'); p; p = strchr (p, '/')) + *p == DIR_SEP_CHAR; +#endif + if (*path == DIR_SEP_CHAR) + return path; + + /* Local path disguised as a remote one (MacOS X) */ + if (!strncasecmp (path, "localhost"DIR_SEP, 10)) + { + memmove (path, path + 9, strlen (path + 9) + 1); + return path; + } + +#ifdef WIN32 + if (*path && asprintf (&ret, "\\\\%s", path) == -1) + ret = NULL; +#endif + /* non-local path :-( */ + } + else + if (schemelen == 2 && !strncasecmp (url, "fd", 2)) + { + int fd = strtol (path, &end, 0); + + if (*end) + goto out; + +#ifndef WIN32 + switch (fd) + { + case 0: + ret = strdup ("/dev/stdin"); + break; + case 1: + ret = strdup ("/dev/stdout"); + break; + case 2: + ret = strdup ("/dev/strerr"); + break; + default: + if (asprintf (&ret, "/dev/fd/%d", fd) == -1) + ret = NULL; + } +#else + if (fd < 2) + ret = strdup ("CON"); + else + ret = NULL; +#endif + } + +out: + free (path); + return ret; /* unknown scheme */ +}