Commit b0baadae authored by Sam Hocevar's avatar Sam Hocevar

* modules/access/http.c:

    + Coding style fixes.
    + Removed a C99-ism.
parent b01cc018
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* http.c: HTTP access plug-in * http.c: HTTP access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: http.c,v 1.41 2003/07/31 23:44:49 fenrir Exp $ * $Id: http.c,v 1.42 2003/08/01 09:45:34 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -401,54 +401,60 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell ) ...@@ -401,54 +401,60 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
* Encode a string in base64 * Encode a string in base64
* Code borrowed from Rafael Steil * Code borrowed from Rafael Steil
*****************************************************************************/ *****************************************************************************/
void encodeblock( unsigned char in[3], unsigned char out[4], int len ) void encodeblock( unsigned char in[3], unsigned char out[4], int len )
{ {
static const char cb64[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; static const char cb64[]
= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
out[0] = cb64[ in[0] >> 2 ]; out[0] = cb64[ in[0] >> 2 ];
out[1] = cb64[ ((in[0] & 0x03) << 4) | ((in[1] & 0xf0) >> 4) ]; out[1] = cb64[ ((in[0] & 0x03) << 4) | ((in[1] & 0xf0) >> 4) ];
out[2] = (unsigned char) (len > 1 ? cb64[ ((in[1] & 0x0f) << 2) | ((in[2] & 0xc0) >> 6) ] : '='); out[2] = (unsigned char) (len > 1 ? cb64[ ((in[1] & 0x0f) << 2) | ((in[2] & 0xc0) >> 6) ] : '=');
out[3] = (unsigned char) (len > 2 ? cb64[ in[2] & 0x3f ] : '='); out[3] = (unsigned char) (len > 2 ? cb64[ in[2] & 0x3f ] : '=');
} }
char *str_base64_encode(char *str, input_thread_t *p_input ) char *str_base64_encode(char *psz_str, input_thread_t *p_input )
{ {
unsigned char in[3], out[4]; unsigned char in[3], out[4];
unsigned int i, len, blocksout = 0, linesize = strlen(str); unsigned int i, len, blocksout = 0, linesize = strlen(psz_str);
char *tmp = str; char *psz_tmp = psz_str;
char *result = (char *)malloc((linesize + 3 - linesize % 3) * 4 / 3 + 1); char *psz_result = (char *)malloc( linesize / 3 * 4 + 5 );
if (!result) if( !psz_result )
{
msg_Err( p_input, "out of memory" ); msg_Err( p_input, "out of memory" );
while (*tmp) { return NULL;
}
while( *psz_tmp )
{
len = 0; len = 0;
for( i = 0; i < 3; i++ ) { for( i = 0; i < 3; i++ )
in[i] = (unsigned char)(*tmp); {
in[i] = (unsigned char)*psz_tmp;
if (*tmp) if (*psz_tmp)
len++; len++;
else else
in[i] = 0; in[i] = 0;
tmp++; psz_tmp++;
} }
if( len ) { if( len )
encodeblock( in, out, len); {
encodeblock( in, out, len );
for( i = 0; i < 4; i++ ) for( i = 0; i < 4; i++ )
result[blocksout++] = out[i]; {
psz_result[blocksout++] = out[i];
}
} }
} }
result[blocksout] = '\0'; psz_result[blocksout] = '\0';
return result; return psz_result;
} }
/***************************************************************************** /*****************************************************************************
* Open: parse URL and open the remote file at the beginning * Open: parse URL and open the remote file at the beginning
*****************************************************************************/ *****************************************************************************/
...@@ -613,9 +619,9 @@ static int Open( vlc_object_t *p_this ) ...@@ -613,9 +619,9 @@ static int Open( vlc_object_t *p_this )
if (psz_user != NULL) if (psz_user != NULL)
{ {
msg_Dbg( p_input, "Authentificating, user=%s, password=%s",
psz_user, psz_pwd );
char psz_user_pwd[MAX_QUERY_SIZE]; char psz_user_pwd[MAX_QUERY_SIZE];
msg_Dbg( p_input, "authenticating, user=%s, password=%s",
psz_user, psz_pwd );
snprintf( psz_user_pwd, MAX_QUERY_SIZE, "%s:%s", psz_user, psz_pwd ); snprintf( psz_user_pwd, MAX_QUERY_SIZE, "%s:%s", psz_user, psz_pwd );
snprintf( p_access_data->psz_auth_string, MAX_QUERY_SIZE, snprintf( p_access_data->psz_auth_string, MAX_QUERY_SIZE,
"Authorization: Basic %s\r\n", "Authorization: Basic %s\r\n",
......
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