fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-05-31 13:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbcurl/hbcurl.c
   * contrib/hbcurl/tests/ftp_uldl.prg
     + Using Harbour FS API.
     ! Minor fix in uploaded file name.

   * contrib/make_b32_all.bat
   * contrib/make_gcc_all.sh
   * contrib/make_vc_all.bat
     + Added to 'all' makefiles.
This commit is contained in:
Viktor Szakats
2008-05-31 11:18:00 +00:00
parent 27485544d5
commit 0cd2603335
6 changed files with 75 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -8,6 +8,17 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-05-31 13:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbcurl/hbcurl.c
* contrib/hbcurl/tests/ftp_uldl.prg
+ Using Harbour FS API.
! Minor fix in uploaded file name.
* contrib/make_b32_all.bat
* contrib/make_gcc_all.sh
* contrib/make_vc_all.bat
+ Added to 'all' makefiles.
2008-05-31 12:46 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+ contrib/hbcurl
+ contrib/hbcurl/Makefile

111
harbour/contrib/hbcurl/hbcurl.c
View File

@@ -59,10 +59,9 @@
#include "hbapi.h"
#include "hbapiitm.h"
#include "hbapifs.h"
#include "hbvm.h"
#include <sys/stat.h>
#include "hbcurl.ch"
#define HB_CURL_OPT_BOOL( n ) ( ISLOG( n ) ? ( long ) hb_parl( n ) : hb_parnl( n ) )
@@ -70,8 +69,8 @@
typedef struct _FTPFILE
{
char * name;
FILE * handle;
BYTE * name;
FHANDLE handle;
} FTPFILE, * PFTPFILE;
typedef struct _CURLHANDLE
@@ -107,44 +106,44 @@ HB_FUNC( CURL_GLOBAL_CLEANUP )
/* ---------------------------- */
int hb_curlReadFunction( void * buffer, size_t size, size_t nmemb, void * Cargo )
size_t hb_curlReadFunction( void * buffer, size_t size, size_t nmemb, void * Cargo )
{
if( Cargo )
{
PFTPFILE pfile_ul = ( PFTPFILE ) Cargo;
size_t ret;
if( ! pfile_ul->handle )
if( pfile_ul->handle == FS_ERROR )
{
pfile_ul->handle = fopen( pfile_ul->name, "rb" );
pfile_ul->handle = hb_fsOpen( pfile_ul->name, FO_READ );
if( ! pfile_ul->handle )
if( pfile_ul->handle == FS_ERROR )
return -1;
}
if( ferror( pfile_ul->handle ) )
return CURL_READFUNC_ABORT;
else
return fread( buffer, size, nmemb, pfile_ul->handle ) * size;
ret = ( size_t ) hb_fsRead( pfile_ul->handle, ( BYTE * ) buffer, size * nmemb );
return hb_fsError() ? CURL_READFUNC_ABORT : ret;
}
return -1;
}
int hb_curlWriteFunction( void * buffer, size_t size, size_t nmemb, void * Cargo )
size_t hb_curlWriteFunction( void * buffer, size_t size, size_t nmemb, void * Cargo )
{
if( Cargo )
{
PFTPFILE pfile_dl = ( PFTPFILE ) Cargo;
if( ! pfile_dl->handle )
if( pfile_dl->handle == FS_ERROR )
{
pfile_dl->handle = fopen( pfile_dl->name, "wb" );
pfile_dl->handle = hb_fsCreate( pfile_dl->name, FC_NORMAL );
if( ! pfile_dl->handle )
if( pfile_dl->handle == FS_ERROR )
return -1;
}
return fwrite( buffer, size, nmemb, pfile_dl->handle );
return hb_fsWrite( pfile_dl->handle, ( BYTE * ) buffer, size * nmemb );
}
return -1;
@@ -213,16 +212,20 @@ static void PCURLHANDLE_free( PCURLHANDLE pConn )
curl_slist_free_all( pConn->sPreQuote );
if( pConn->file_ul.name )
{
hb_xfree( pConn->file_ul.name );
if( pConn->file_ul.handle )
fclose( pConn->file_ul.handle);
if( pConn->file_ul.handle != FS_ERROR )
hb_fsClose( pConn->file_ul.handle );
}
if( pConn->file_dl.name )
{
hb_xfree( pConn->file_dl.name );
if( pConn->file_dl.handle )
fclose( pConn->file_dl.handle);
if( pConn->file_dl.handle != FS_ERROR )
hb_fsClose( pConn->file_dl.handle );
}
if( pConn->pProgress )
hb_itemRelease( pConn->pProgress );
@@ -791,15 +794,16 @@ HB_FUNC( CURL_EASY_SETOPT )
{
hb_xfree( pConn->file_ul.name );
pConn->file_ul.name = NULL;
if( pConn->file_ul.handle != FS_ERROR )
{
hb_fsClose( pConn->file_ul.handle );
pConn->file_ul.handle = FS_ERROR;
}
}
if( pConn->file_ul.handle )
{
fclose( pConn->file_ul.handle );
pConn->file_ul.handle = NULL;
}
pConn->file_ul.name = hb_strdup( hb_parc( 3 ) );
pConn->file_ul.name = ( BYTE * ) hb_strdup( hb_parc( 3 ) );
pConn->file_ul.handle = FS_ERROR;
curl_easy_setopt( pConn->curl, CURLOPT_READFUNCTION, hb_curlReadFunction );
res = curl_easy_setopt( pConn->curl, CURLOPT_READDATA, ( void * ) &pConn->file_ul );
@@ -812,17 +816,19 @@ HB_FUNC( CURL_EASY_SETOPT )
{
hb_xfree( pConn->file_ul.name );
pConn->file_ul.name = NULL;
}
if( pConn->file_ul.handle )
{
fclose( pConn->file_ul.handle );
pConn->file_ul.handle = NULL;
res = CURLE_OK;
if( pConn->file_ul.handle != FS_ERROR )
{
hb_fsClose( pConn->file_ul.handle );
pConn->file_ul.handle = FS_ERROR;
res = CURLE_OK;
}
else
res = ( CURLcode ) -1;
}
else
res = ( CURLcode ) -1;
res = CURLE_OK;
}
break;
@@ -832,15 +838,16 @@ HB_FUNC( CURL_EASY_SETOPT )
{
hb_xfree( pConn->file_dl.name );
pConn->file_dl.name = NULL;
if( pConn->file_dl.handle != FS_ERROR )
{
hb_fsClose( pConn->file_dl.handle );
pConn->file_dl.handle = FS_ERROR;
}
}
if( pConn->file_dl.handle )
{
fclose( pConn->file_dl.handle );
pConn->file_dl.handle = NULL;
}
pConn->file_dl.name = hb_strdup( hb_parc( 3 ) );
pConn->file_dl.name = ( BYTE * ) hb_strdup( hb_parc( 3 ) );
pConn->file_dl.handle = FS_ERROR;
curl_easy_setopt( pConn->curl, CURLOPT_WRITEFUNCTION, hb_curlWriteFunction );
res = curl_easy_setopt( pConn->curl, CURLOPT_WRITEDATA, ( void * ) &pConn->file_dl );
@@ -853,17 +860,19 @@ HB_FUNC( CURL_EASY_SETOPT )
{
hb_xfree( pConn->file_dl.name );
pConn->file_dl.name = NULL;
}
if( pConn->file_dl.handle )
{
fclose( pConn->file_dl.handle );
pConn->file_dl.handle = NULL;
res = CURLE_OK;
if( pConn->file_dl.handle != FS_ERROR )
{
hb_fsClose( pConn->file_dl.handle );
pConn->file_dl.handle = FS_ERROR;
res = CURLE_OK;
}
else
res = ( CURLcode ) -1;
}
else
res = ( CURLcode ) -1;
res = CURLE_OK;
}
break;

2
harbour/contrib/hbcurl/tests/ftp_uldl.prg
View File

@@ -6,7 +6,7 @@
#include "hbcurl.ch"
#define LOCAL_FILE "ftp_up.prg"
#define LOCAL_FILE "ftp_uldl.prg"
#define UPLOAD_FILE_AS "ftp_upped.prg"
#define REMOTE_URL "ftp://harbour:power@localhost/" + UPLOAD_FILE_AS
#define RENAME_FILE_TO "ftp_upped_renamed.prg"

1
harbour/contrib/make_b32_all.bat
View File

@@ -54,6 +54,7 @@ if not "%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql
if not "%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql
if not "%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads
if not "%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf
if not "%HB_DIR_CURL%" == "" set _HB_DIRS=%_HB_DIRS% hbcurl
for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
rem *******************************************************

1
harbour/contrib/make_gcc_all.sh
View File

@@ -56,6 +56,7 @@ if [ "${HB_INC_MYSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbmysql "; fi;
if [ "${HB_INC_PGSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbpgsql "; fi;
if [ "${HB_INC_ADS}" != "" ]; then _HB_DIRS="${_HB_DIRS} rddads "; fi;
if [ "${HB_INC_LIBHARU}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbhpdf "; fi;
if [ "${HB_INC_CURL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbcurl "; fi;
_HB_DIRS="${_HB_DIRS} ${_HB_DIRS_ADD}"

1
harbour/contrib/make_vc_all.bat
View File

@@ -54,6 +54,7 @@ if not "%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql
if not "%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql
if not "%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads
if not "%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf
if not "%HB_DIR_CURL%" == "" set _HB_DIRS=%_HB_DIRS% hbcurl
for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
rem *******************************************************