Menu
▾
▴
[Xastir-checkins] CVS: xastir/src track_gui.c,1.38,1.39 util.c,1.168,1.169 map_WMS.c,1.12,1.13 map_geo.c,1.54,1.55 map_tiger.c,1.40,1.41 maps.c,1.434,1.435 util.h,1.35,1.36
|
From: Curt M. <we...@us...> - 2005-07-22 06:08:33
|
Update of /cvsroot/xastir/xastir/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20696 Modified Files: track_gui.c util.c map_WMS.c map_geo.c map_tiger.c maps.c util.h Log Message: Consolidating all of the libcurl and wget functionality into util.c:fetch_remote_file(). This should make the code much easier to maintain and extend. Index: track_gui.c =================================================================== RCS file: /cvsroot/xastir/xastir/src/track_gui.c,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** track_gui.c 21 Jul 2005 02:12:22 -0000 1.38 --- track_gui.c 22 Jul 2005 06:08:17 -0000 1.39 *************** *** 400,409 **** char temp[MAX_CALLSIGN+1]; char fileimg[400]; - #ifdef HAVE_LIBCURL - #else - #ifdef HAVE_WGET - char tempfile[500]; - #endif // HAVE_WGET - #endif char log_filename[200]; char *temp_ptr; --- 400,403 ---- *************** *** 468,495 **** // "http://www.findu.com/cgi-bin/rawposit.cgi?call=%s&start=%d&length=%d&time=1",// New download_trail_station_call,posit_start,posit_length); - #ifdef HAVE_LIBCURL - if (curl_getfile(fileimg, log_filename)) { - // Had trouble getting the file. Abort. - return; - } - #else - #ifdef HAVE_WGET - xastir_snprintf(tempfile, sizeof(tempfile), - "%s --server-response --timestamping --tries=1 --timeout=30 --output-document=%s \'%s\' 2> /dev/null\n", - WGET_PATH, - log_filename, - fileimg); ! if (debug_level & 2) ! fprintf(stderr,"%s",tempfile); ! ! if ( system(tempfile) ) { // Go get the file ! fprintf(stderr,"Couldn't download the trail\n"); return; } - #else // HAVE_WGET - fprintf(stderr,"libcurl or 'wget' not installed. Can't download trail\n"); - #endif // HAVE_WGET - #endif // Set permissions on the file so that any user can overwrite it. --- 462,470 ---- // "http://www.findu.com/cgi-bin/rawposit.cgi?call=%s&start=%d&length=%d&time=1",// New download_trail_station_call,posit_start,posit_length); ! if (fetch_remote_file(fileimg, log_filename)) { ! // Had trouble getting the file. Abort. return; } // Set permissions on the file so that any user can overwrite it. Index: util.c =================================================================== RCS file: /cvsroot/xastir/xastir/src/util.c,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** util.c 13 Jul 2005 19:37:52 -0000 1.168 --- util.c 22 Jul 2005 06:08:22 -0000 1.169 *************** *** 4298,4301 **** --- 4298,4302 ---- return fwrite(buffer, size, nmemb, out->stream); } + #endif // HAVE_LIBCURL *************** *** 4306,4329 **** // 1 If there was a problem getting the file // ! // Currently these files use curl functions and could be modified to ! // use curl_getfile() instead: ! // ! // map_geo.c ! // map_geo-center.c ! // map_tiger.c ! // map_WMS.c ! // util.c ! // ! // These files use wget functions and could be modifed to use ! // curl_getfile() instead (with a new name and wget functionality ! // included): ! // ! // map_geo.c ! // map_geo-center.c ! // map_tiger.c ! // map_WMS.c ! // track_gui.c ! // ! int curl_getfile(char *fileimg, char *local_filename) { CURL *curl; CURLcode res; --- 4307,4314 ---- // 1 If there was a problem getting the file // ! int fetch_remote_file(char *fileimg, char *local_filename) { ! ! #ifdef HAVE_LIBCURL ! CURL *curl; CURLcode res; *************** *** 4335,4340 **** --- 4320,4332 ---- if (curl) { + // verbose debug is keen + //curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE); + curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerr); + + // write function curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_fwrite); + + // download from fileimg curl_easy_setopt(curl, CURLOPT_URL, fileimg); *************** *** 4385,4391 **** return(1); } ! return(0); } - #endif //HAVE_LIBCURL --- 4377,4413 ---- return(1); } ! return(0); // Success! ! ! #else // HAVE_LIBCURL ! ! #ifdef HAVE_WGET ! ! char tempfile[500]; ! ! xastir_snprintf(tempfile, sizeof(tempfile), ! "%s --server-response --timestamping --tries=1 --timeout=%d --output-document=%s \'%s\' 2> /dev/null\n", ! WGET_PATH, ! net_map_timeout, ! local_filename, ! fileimg); ! ! if (debug_level & 2) ! fprintf(stderr,"%s",tempfile); ! ! if ( system(tempfile) ) { // Go get the file ! fprintf(stderr,"Couldn't download the file\n"); ! return(1); ! } ! return(0); // Success! ! ! #else // HAVE_WGET ! ! fprintf(stderr,"libcurl or 'wget' not installed. Can't download file\n"); ! return(1); ! ! #endif // HAVE_WGET ! #endif // HAVE_LIBCURL ! } Index: map_WMS.c =================================================================== RCS file: /cvsroot/xastir/xastir/src/map_WMS.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** map_WMS.c 9 Jul 2005 03:27:16 -0000 1.12 --- map_WMS.c 22 Jul 2005 06:08:22 -0000 1.13 *************** *** 114,127 **** #endif // HAVE_IMAGEMAGICK - #ifdef HAVE_LIBCURL - #include <curl/curl.h> - #include <curl/types.h> - #include <curl/easy.h> - struct FtpFile { - char *filename; - FILE *stream; - }; - #endif // HAVE_LIBCURL extern int npoints; /* tsk tsk tsk -- globals */ --- 114,118 ---- *************** *** 195,208 **** XColor my_colors[256]; int trans_skip = 0; // skip transparent pixel - #ifdef HAVE_LIBCURL - CURL *curl; - CURLcode res; - char curlerr[CURL_ERROR_SIZE]; - struct FtpFile ftpfile; - #else // HAVE_LIBCURL - #ifdef HAVE_WGET - char tempfile[MAX_FILENAME]; - #endif // HAVE_WGET - #endif // HAVE_LIBCURL double left, right, top, bottom, map_width, map_height; double lat_center = 0; --- 186,189 ---- *************** *** 561,647 **** } ! #ifdef HAVE_LIBCURL ! curl = curl_easy_init(); ! ! if (curl) { ! ! /* verbose debug is keen */ ! // curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE); ! curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerr); ! ! curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)net_map_timeout); ! curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, (long)(net_map_timeout/2)); ! ! // Added in libcurl 7.9.8 ! #if (LIBCURL_VERSION_NUM >= 0x070908) ! curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); ! #endif // LIBCURL_VERSION_NUM ! ! // Added in libcurl 7.10.6 ! #if (LIBCURL_VERSION_NUM >= 0x071006) ! curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); ! #endif // LIBCURL_VERSION_NUM ! ! // Added in libcurl 7.10.7 ! #if (LIBCURL_VERSION_NUM >= 0x071007) ! curl_easy_setopt(curl, CURLOPT_PROXYAUTH, CURLAUTH_ANY); ! #endif // LIBCURL_VERSION_NUM ! ! // Only included in newer libcurl? ! // curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); ! ! /* write function */ ! curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_fwrite); ! ! /* download from fileimg */ ! curl_easy_setopt(curl, CURLOPT_URL, fileimg); ! ! /* save as local_filename */ ! ftpfile.filename = local_filename; ! ftpfile.stream = NULL; ! curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile); ! ! res = curl_easy_perform(curl); ! ! curl_easy_cleanup(curl); ! ! if (CURLE_OK != res) { ! fprintf(stderr, "curl told us %d\n", res); ! fprintf(stderr, "curlerr: %s\n", curlerr); ! } ! ! if (ftpfile.stream) ! fclose(ftpfile.stream); ! ! // Return if we had trouble ! if (CURLE_OK != res) { ! return; ! } ! ! } else { ! fprintf(stderr,"Couldn't download the WMS image\n"); return; } - #else // HAVE_LIBCURL - #ifdef HAVE_WGET - xastir_snprintf(tempfile, sizeof(tempfile), - "%s --server-response --timestamping --tries=1 --timeout=%d --output-document=%s \'%s\' 2> /dev/null\n", - WGET_PATH, - net_map_timeout, - local_filename, - fileimg); - - if (debug_level & 512) - fprintf(stderr,"%s",tempfile); - - if (system(tempfile)) { // Go get the file - fprintf(stderr,"Couldn't download the WMS image\n"); - return; - } - #else // HAVE_WGET - fprintf(stderr,"libcurl or 'wget' not installed. Can't download image\n"); - #endif // HAVE_WGET - #endif // HAVE_LIBCURL - // For debugging the MagickError/MagickWarning segfaults. --- 542,549 ---- } ! if (fetch_remote_file(fileimg, local_filename)) { ! // Had trouble getting the file. Abort. return; } // For debugging the MagickError/MagickWarning segfaults. Index: map_geo.c =================================================================== RCS file: /cvsroot/xastir/xastir/src/map_geo.c,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** map_geo.c 11 Jul 2005 19:24:04 -0000 1.54 --- map_geo.c 22 Jul 2005 06:08:22 -0000 1.55 *************** *** 127,140 **** #endif // HAVE_IMAGEMAGICK - #ifdef HAVE_LIBCURL - #include <curl/curl.h> - #include <curl/types.h> - #include <curl/easy.h> - struct FtpFile { - char *filename; - FILE *stream; - }; - #endif extern int npoints; /* tsk tsk tsk -- globals */ --- 127,131 ---- *************** *** 225,238 **** int my_screen_width, my_screen_height; float my_zoom = 1.0; - #ifdef HAVE_LIBCURL - CURL *curl; - CURLcode res; - char curlerr[CURL_ERROR_SIZE]; - struct FtpFile ftpfile; - #else - #ifdef HAVE_WGET - char tempfile[MAX_FILENAME]; - #endif // HAVE_WGET - #endif // HAVE_LIBCURL --- 216,219 ---- *************** *** 375,462 **** // routines to use it. ! #ifdef HAVE_LIBCURL ! curl = curl_easy_init(); ! ! if (curl) { ! ! /* verbose debug is keen */ ! //curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE); ! curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerr); ! ! curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)net_map_timeout); ! curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, (long)(net_map_timeout/2)); ! ! // Added in libcurl 7.9.8 ! #if (LIBCURL_VERSION_NUM >= 0x070908) ! curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); ! #endif // LIBCURL_VERSION_NUM ! ! // Added in libcurl 7.10.6 ! #if (LIBCURL_VERSION_NUM >= 0x071006) ! curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); ! #endif // LIBCURL_VERSION_NUM ! ! // Added in libcurl 7.10.7 ! #if (LIBCURL_VERSION_NUM >= 0x071007) ! curl_easy_setopt(curl, CURLOPT_PROXYAUTH, CURLAUTH_ANY); ! #endif // LIBCURL_VERSION_NUM ! ! // This is only available in later versions of libcurl? ! // curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); ! ! /* write function */ ! curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_fwrite); ! ! /* download from fileimg */ ! curl_easy_setopt(curl, CURLOPT_URL, fileimg); ! ! /* save as local_filename */ ! ftpfile.filename = local_filename; ! ftpfile.stream = NULL; ! curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile); ! ! res = curl_easy_perform(curl); ! ! curl_easy_cleanup(curl); ! ! if (CURLE_OK != res) { ! fprintf(stderr, "curl told us %d\n", res); ! fprintf(stderr, "curlerr: %s\n", curlerr); ! } ! ! if (ftpfile.stream) ! fclose(ftpfile.stream); ! ! // Return if we had trouble ! if (CURLE_OK != res) { ! return; ! } ! ! } else { ! fprintf(stderr,"Couldn't download the toporama .geo file\n"); ! return; ! } ! ! ! #else ! #ifdef HAVE_WGET ! xastir_snprintf(tempfile, sizeof(tempfile), ! "%s --server-response --timestamping --tries=1 --timeout=30 --output-document=%s \'%s\' 2> /dev/null\n", ! WGET_PATH, ! local_filename, ! fileimg); ! ! if (debug_level & 16) ! fprintf(stderr,"%s",tempfile); ! ! //fprintf(stderr,"Getting file\n"); ! if ( system(tempfile) ) { // Go get the file ! fprintf(stderr,"Couldn't download the toporama geo file\n"); return; } - #else // HAVE_WGET - fprintf(stderr,"libcurl or 'wget' not installed. Can't download toporama .geo file\n"); - #endif // HAVE_WGET - #endif // HAVE_LIBCURL // Set permissions on the file so that any user can overwrite it. --- 356,363 ---- // routines to use it. ! if (fetch_remote_file(fileimg, local_filename)) { ! // Had trouble getting the file. Abort. return; } // Set permissions on the file so that any user can overwrite it. *************** *** 603,616 **** XColor my_colors[256]; time_t query_start_time, query_end_time; - #ifdef HAVE_LIBCURL - CURL *curl; - CURLcode res; - char curlerr[CURL_ERROR_SIZE]; - struct FtpFile ftpfile; - #else - #ifdef HAVE_WGET - char tempfile[MAX_FILENAME]; - #endif // HAVE_WGET - #endif // HAVE_LIBCURL char gamma[16]; struct { --- 504,507 ---- *************** *** 1487,1576 **** unlink( local_filename ); ! #ifdef HAVE_LIBCURL ! curl = curl_easy_init(); ! ! if (curl) { ! ! /* verbose debug is keen */ ! // curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE); ! curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerr); ! ! curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)net_map_timeout); ! curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, (long)(net_map_timeout/2)); ! ! // Added in libcurl 7.9.8 ! #if (LIBCURL_VERSION_NUM >= 0x070908) ! curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); ! #endif // LIBCURL_VERSION_NUM ! ! // Added in libcurl 7.10.6 ! #if (LIBCURL_VERSION_NUM >= 0x071006) ! curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); ! #endif // LIBCURL_VERSION_NUM ! ! // Added in libcurl 7.10.7 ! #if (LIBCURL_VERSION_NUM >= 0x071007) ! curl_easy_setopt(curl, CURLOPT_PROXYAUTH, CURLAUTH_ANY); ! #endif // LIBCURL_VERSION_NUM ! ! // This is only available in later versions of libcurl? ! // curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); ! ! /* write function */ ! curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_fwrite); ! ! /* download from fileimg */ ! curl_easy_setopt(curl, CURLOPT_URL, fileimg); ! ! /* save as local_filename */ ! ftpfile.filename = local_filename; ! ftpfile.stream = NULL; ! curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile); ! ! res = curl_easy_perform(curl); ! ! curl_easy_cleanup(curl); ! ! if (CURLE_OK != res) { ! fprintf(stderr, "curl told us %d\n", res); ! fprintf(stderr, "curlerr: %s\n", curlerr); ! } ! ! if (ftpfile.stream) ! fclose(ftpfile.stream); ! ! // Return if we had trouble ! if (CURLE_OK != res) { ! return; ! } ! ! } else { ! fprintf(stderr,"Couldn't download the geo or Terraserver image\n"); ! return; ! } ! ! ! #else ! #ifdef HAVE_WGET ! xastir_snprintf(tempfile, sizeof(tempfile), ! "%s --server-response --timestamping --tries=1 --timeout=30 --output-document=%s \'%s\' 2> /dev/null\n", ! WGET_PATH, ! local_filename, ! fileimg); ! ! if (debug_level & 16) ! fprintf(stderr,"%s",tempfile); ! ! //fprintf(stderr,"Getting file\n"); ! if ( system(tempfile) ) { // Go get the file ! fprintf(stderr,"Couldn't download the geo or Terraserver image\n"); return; } ! #else // HAVE_WGET ! fprintf(stderr,"libcurl or 'wget' not installed. Can't download image\n"); ! #endif // HAVE_WGET ! #endif // HAVE_LIBCURL ! ! #ifdef USE_MAP_CACHE --- 1378,1386 ---- unlink( local_filename ); ! if (fetch_remote_file(fileimg, local_filename)) { ! // Had trouble getting the file. Abort. return; } ! #ifdef USE_MAP_CACHE Index: map_tiger.c =================================================================== RCS file: /cvsroot/xastir/xastir/src/map_tiger.c,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** map_tiger.c 9 Jul 2005 03:27:16 -0000 1.40 --- map_tiger.c 22 Jul 2005 06:08:22 -0000 1.41 *************** *** 114,127 **** #endif // HAVE_IMAGEMAGICK - #ifdef HAVE_LIBCURL - #include <curl/curl.h> - #include <curl/types.h> - #include <curl/easy.h> - struct FtpFile { - char *filename; - FILE *stream; - }; - #endif // HAVE_LIBCURL extern int npoints; /* tsk tsk tsk -- globals */ --- 114,118 ---- *************** *** 142,157 **** time_t query_start_time, query_end_time; - #ifdef HAVE_LIBCURL - CURL *curl; - CURLcode res; - char curlerr[CURL_ERROR_SIZE]; - struct FtpFile ftpfile; - #else // HAVE_LIBCURL - #ifdef HAVE_WGET - char tempfile[MAX_FILENAME]; - #endif // HAVE_WGET - #endif // HAVE_LIBCURL - - #ifdef USE_MAP_CACHE int map_cache_return = 1; // Default = cache miss --- 133,136 ---- *************** *** 216,312 **** unlink( local_filename ); ! #ifdef HAVE_LIBCURL ! ! if (debug_level & 512) { ! fprintf(stderr,"map_tiger using curl\n"); ! } ! ! ! curl = curl_easy_init(); ! ! if (curl) { ! ! /* verbose debug is keen */ ! // curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE); ! curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerr); ! ! curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)net_map_timeout); ! curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, (long)(net_map_timeout/2)); ! ! // Added in libcurl 7.9.8 ! #if (LIBCURL_VERSION_NUM >= 0x070908) ! curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); ! #endif // LIBCURL_VERSION_NUM ! ! // Added in libcurl 7.10.6 ! #if (LIBCURL_VERSION_NUM >= 0x071006) ! curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); ! #endif // LIBCURL_VERSION_NUM ! ! // Added in libcurl 7.10.7 ! #if (LIBCURL_VERSION_NUM >= 0x071007) ! curl_easy_setopt(curl, CURLOPT_PROXYAUTH, CURLAUTH_ANY); ! #endif // LIBCURL_VERSION_NUM ! ! // Only included in newer libcurl? ! // curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); ! ! /* write function */ ! curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_fwrite); ! ! /* download from fileimg */ ! curl_easy_setopt(curl, CURLOPT_URL, fileimg); ! ! /* save as local_filename */ ! ftpfile.filename = local_filename; ! ftpfile.stream = NULL; ! curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile); ! ! res = curl_easy_perform(curl); ! ! curl_easy_cleanup(curl); ! ! if (CURLE_OK != res) { ! fprintf(stderr, "curl told us %d\n", res); ! fprintf(stderr, "curlerr: %s\n", curlerr); ! } ! ! if (ftpfile.stream) ! fclose(ftpfile.stream); ! ! // Return if we had trouble ! if (CURLE_OK != res) { ! return; ! } ! ! } else { ! fprintf(stderr,"Couldn't download the Tigermap image\n"); return; } - #else // HAVE_LIBCURL - #ifdef HAVE_WGET - - if (debug_level & 512) { - fprintf(stderr,"map_tiger using wget \n"); - } - xastir_snprintf(tempfile, sizeof(tempfile), - "%s --server-response --timestamping --tries=1 --timeout=%d --output-document=%s \'%s\' 2> /dev/null\n", - WGET_PATH, - net_map_timeout, - local_filename, - fileimg); - - if (debug_level & 512) - fprintf(stderr,"%s",tempfile); - - if (system(tempfile)) { // Go get the file - fprintf(stderr,"Couldn't download the Tigermap image\n"); - return; - } - #else // HAVE_WGET - fprintf(stderr,"libcurl or 'wget' not installed. Can't download image\n"); - #endif // HAVE_WGET - #endif // HAVE_LIBCURL - // For debugging the MagickError/MagickWarning segfaults. --- 195,202 ---- unlink( local_filename ); ! if (fetch_remote_file(fileimg, local_filename)) { ! // Had trouble getting the file. Abort. return; } // For debugging the MagickError/MagickWarning segfaults. Index: maps.c =================================================================== RCS file: /cvsroot/xastir/xastir/src/maps.c,v retrieving revision 1.434 retrieving revision 1.435 diff -C2 -d -r1.434 -r1.435 *** maps.c 26 Jun 2005 00:30:15 -0000 1.434 --- maps.c 22 Jul 2005 06:08:22 -0000 1.435 *************** *** 102,116 **** #include <math.h> - #ifdef HAVE_LIBCURL - #include <curl/curl.h> - #include <curl/types.h> - #include <curl/easy.h> - - struct FtpFile { - char *filename; - FILE *stream; - }; - #endif - #include "xastir.h" #include "maps.h" --- 102,105 ---- Index: util.h =================================================================== RCS file: /cvsroot/xastir/xastir/src/util.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** util.h 22 Jun 2005 01:10:09 -0000 1.35 --- util.h 22 Jul 2005 06:08:23 -0000 1.36 *************** *** 130,137 **** extern short checkHash(char *theCall, short theHash); ! #ifdef HAVE_LIBCURL ! int curl_fwrite(void *buffer, size_t size, size_t nmemb, void *stream); ! int curl_getfile(char *fileimg, char *local_filename); ! #endif extern void split_string( char *data, char *cptr[], int max ); --- 130,134 ---- extern short checkHash(char *theCall, short theHash); ! int fetch_remote_file(char *fileimg, char *local_filename); extern void split_string( char *data, char *cptr[], int max ); |