--- parser3/src/main/pa_common.C 2005/11/18 09:11:21 1.204.6.3 +++ parser3/src/main/pa_common.C 2005/11/22 15:54:21 1.204.6.8 @@ -3,9 +3,30 @@ Copyright(c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) + + * BASE64 part + * Authors: Michael Zucchi + * Jeffrey Stedfast + * + * Copyright 2000-2004 Ximian, Inc. (www.ximian.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. + * */ -static const char * const IDENT_COMMON_C="$Date: 2005/11/18 09:11:21 $"; +static const char * const IDENT_COMMON_C="$Date: 2005/11/22 15:54:21 $"; #include "pa_common.h" #include "pa_exception.h" @@ -216,64 +237,67 @@ static int http_read_response(char*& res response_size=preview_size+content_length; // a little more than needed, will adjust response_size by actual received size later } - // allocating initial buf - response=(char*)pa_malloc_atomic(response_size+1/*terminator*/); // just setting memory block type - char* ptr=response; - size_t todo_size=response_size; - // coping part of already received body - memcpy(ptr, preview_buf, received_size); - ptr+=received_size; - todo_size-=received_size; - - // we use terminator byte for two purposes here: - // 1. we return there zero always, not knowing: maybe they would want to create String form $file.body? - // invariant: all Strings should have zero-terminated buffers - // 2. we use that out-of-size byte to detect if our content-length guess was wrong - // when recv gets more than we expected - // a) we know that the content-length guess was wrong - // b) we have space to put the first byte of extra data - // c) we use less code to detect normal situation: on last while-cycle recv expected to just return 0 - while(true) { - received_size=recv(sock, ptr, todo_size+1/*there is always a place for terminator*/, 0); - if(received_size==0) { - response_size-=todo_size; // in case we received less than expected, cut down the reported size - break; - } - if(received_size<0) { - if(int no=pa_socks_errno()) - throw Exception("http.timeout", - 0, - "error receiving response body: %s (%d)", pa_socks_strerr(no), no); - break; - } - // they've touched the terminator? - if((size_t)received_size>todo_size) - { - // that means that our guessed response_size was not big enough - const size_t grow_chunk_size=0x400*0x400; // 1M - response_size+=grow_chunk_size; - size_t ptr_offset=ptr-response; - response=(char*)pa_realloc(response, response_size+1/*terminator*/); - ptr=response+ptr_offset; - todo_size+=grow_chunk_size; - } - // can't do this before realloc: we need 1?1:0); - result=status_code.as_int(); - - if(fail_on_status_ne_200 && result!=200) - throw Exception("http.status", - &status_code, - "invalid HTTP response status"); + // we use terminator byte for two purposes here: + // 1. we return there zero always, not knowing: maybe they would want to create String form $file.body? + // invariant: all Strings should have zero-terminated buffers + // 2. we use that out-of-size byte to detect if our content-length guess was wrong + // when recv gets more than we expected + // a) we know that the content-length guess was wrong + // b) we have space to put the first byte of extra data + // c) we use less code to detect normal situation: on last while-cycle recv expected to just return 0 + while(true) { + received_size=recv(sock, ptr, todo_size+1/*there is always a place for terminator*/, 0); + if(received_size==0) { + response_size-=todo_size; // in case we received less than expected, cut down the reported size + break; + } + if(received_size<0) { + if(int no=pa_socks_errno()) + throw Exception("http.timeout", + 0, + "error receiving response body: %s (%d)", pa_socks_strerr(no), no); + break; + } + // they've touched the terminator? + if((size_t)received_size>todo_size) + { + // that means that our guessed response_size was not big enough + const size_t grow_chunk_size=0x400*0x400; // 1M + response_size+=grow_chunk_size; + size_t ptr_offset=ptr-response; + response=(char*)pa_realloc(response, response_size+1/*terminator*/); + ptr=response+ptr_offset; + todo_size+=grow_chunk_size; + } + // can't do this before realloc: we need 1?1:0); + result=status_code.as_int(); + + if(fail_on_status_ne_200 && result!=200) + throw Exception("http.status", + &status_code, + "invalid HTTP response status"); + } } } done: @@ -455,7 +479,7 @@ static const String* basic_authorization if(pass) combined<> 16; + *outptr++ = saved >> 8; + *outptr++ = saved; + i = 0; + } + } + } + + *save = saved; + *state = i; + + /* quick scan back for '=' on the end somewhere */ + /* fortunately we can drop 1 output char for each trailing = (upto 2) */ + i = 2; + while (inptr > in && i) { + inptr--; + if (gmime_base64_rank[*inptr] != 0xff) { + if (*inptr == '=' && outptr > out) + outptr--; + i--; + } + } + + /* if i != 0 then there is a truncation error! */ + return (outptr - out); +} + + +char* pa_base64_encode(const char *in, size_t in_size) { /* wont go to more than 2x size (overly conservative) */ - char* result=new(PointerFreeGC) char[len * 2 + 6]; + char* result=new(PointerFreeGC) char[in_size * 2 + 6]; int state=0; int save=0; #ifndef NDEBUG size_t filled= #endif - g_mime_utils_base64_encode_close ((const unsigned char*)in, len, + g_mime_utils_base64_encode_close ((const unsigned char*)in, in_size, (unsigned char*)result, &state, &save); - assert(filled <= len * 2 + 6); + assert(filled <= in_size * 2 + 6); return result; } + +void pa_base64_decode(const char *in, size_t in_size, char*& result, size_t& result_size) +{ + /* wont go to more than had (overly conservative) */ + result=new(PointerFreeGC) char[in_size+1/*terminator*/]; + int state=0; + int save=0; + result_size= + g_mime_utils_base64_decode_step ((const unsigned char*)in, in_size, + (unsigned char*)result, &state, &save); + assert(result_size <= in_size); + result[result_size]=0; // for text files +}