aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-01-29 23:01:15 +0000
committerThierry Vignaud <tv@mandriva.org>2008-01-29 23:01:15 +0000
commit7a3004a200ab50181cc2b57f3e6f1b0fa210c0fa (patch)
tree8e7f1338c4cc63c07c30c1e68e1192f035c6646e
parent83b2c1dc23c190d70f0a936daa0d5db5ad53e270 (diff)
downloadrpmdrake-7a3004a200ab50181cc2b57f3e6f1b0fa210c0fa.tar
rpmdrake-7a3004a200ab50181cc2b57f3e6f1b0fa210c0fa.tar.gz
rpmdrake-7a3004a200ab50181cc2b57f3e6f1b0fa210c0fa.tar.bz2
rpmdrake-7a3004a200ab50181cc2b57f3e6f1b0fa210c0fa.tar.xz
rpmdrake-7a3004a200ab50181cc2b57f3e6f1b0fa210c0fa.zip
drop now useless curl XS binding
-rw-r--r--grpmi/curl_download/Makefile6
-rw-r--r--grpmi/curl_download/Makefile.PL8
-rw-r--r--grpmi/curl_download/curl_download.pm11
-rw-r--r--grpmi/curl_download/curl_download.xs345
4 files changed, 4 insertions, 366 deletions
diff --git a/grpmi/curl_download/Makefile b/grpmi/curl_download/Makefile
index 76721838..363ad0af 100644
--- a/grpmi/curl_download/Makefile
+++ b/grpmi/curl_download/Makefile
@@ -1,11 +1,11 @@
.PHONY: clean
-curl_download: %: %.xs
- test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
+curl_download:
+ test -e Makefile_c || perl Makefile.PL
$(MAKE) -f Makefile_c
install:
- test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
+ test -e Makefile_c || perl Makefile.PL
$(MAKE) -f Makefile_c install
clean:
diff --git a/grpmi/curl_download/Makefile.PL b/grpmi/curl_download/Makefile.PL
index cc1fc8bf..9bb1eebe 100644
--- a/grpmi/curl_download/Makefile.PL
+++ b/grpmi/curl_download/Makefile.PL
@@ -1,15 +1,9 @@
use ExtUtils::MakeMaker;
-my $libs = `curl-config --libs`;
-$? == 0 or die "CURL development environment seems to be missing (curl-config command reports an error)\n";
-chomp $libs;
-
WriteMakefile(
'NAME' => 'curl_download',
- 'LIBS' => [ $libs ],
+ 'INSTALLDIRS' => 'vendor',
'VERSION_FROM' => 'curl_download.pm', # finds VERSION
- 'OBJECT' => 'curl_download.o',
'INC' => '-I.',
- 'OPTIMIZE' => '-O2 -Wall -Werror',
'MAKEFILE' => 'Makefile_c',
);
diff --git a/grpmi/curl_download/curl_download.pm b/grpmi/curl_download/curl_download.pm
index f24506a9..36d49017 100644
--- a/grpmi/curl_download/curl_download.pm
+++ b/grpmi/curl_download/curl_download.pm
@@ -3,13 +3,8 @@ package curl_download;
use strict;
use urpm::download;
-require DynaLoader;
-
-our @ISA = qw(DynaLoader);
our $VERSION = '1.2';
-bootstrap curl_download $VERSION;
-
sub readproxy (;$) {
my $proxy = get_proxy($_[0]);
($proxy->{http_proxy} || $proxy->{ftp_proxy} || '',
@@ -25,10 +20,4 @@ sub writeproxy {
dump_proxy_config();
}
-sub download {
- my ($url, $location, $downloadprogress_callback) = @_;
-
- download_real($url, $location, $downloadprogress_callback, readproxy());
-}
-
1;
diff --git a/grpmi/curl_download/curl_download.xs b/grpmi/curl_download/curl_download.xs
deleted file mode 100644
index b1edea81..00000000
--- a/grpmi/curl_download/curl_download.xs
+++ /dev/null
@@ -1,345 +0,0 @@
-/* -*- c -*-
- *
- * Copyright (c) 2002 Guillaume Cottenceau (gc at mandrakesoft dot com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- * 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 Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- ******************************************************************************/
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
-
-#include <curl/curl.h>
-#include <curl/easy.h>
-
-#include <libintl.h>
-#undef _
-#define _(arg) dgettext("rpmdrake", arg)
-
-char * my_asprintf(char *msg, ...)
-{
- char * out;
- va_list args;
- va_start(args, msg);
- if (vasprintf(&out, msg, args) == -1)
- out = "";
- va_end(args);
- return out;
-}
-
-
-SV * downloadprogress_callback_sv = NULL;
-
-int my_progress_func(void *ptr, double td, double dd, double tu, double du)
-{
- dSP;
- if (!downloadprogress_callback_sv)
- return 0;
- ENTER;
- SAVETMPS;
- PUSHMARK(SP);
- XPUSHs(sv_2mortal(newSVnv(td)));
- XPUSHs(sv_2mortal(newSVnv(dd)));
- PUTBACK;
- perl_call_sv(downloadprogress_callback_sv, G_DISCARD);
- FREETMPS;
- LEAVE;
- return 0;
-}
-
-char * download_url_real(char * url, char * location, char * proxy, char * proxy_user)
-{
- CURL *curl;
- CURLcode rescurl = CURL_LAST;
-
- if ((curl = curl_easy_init())) {
- char * outfilename;
- struct stat statbuf;
- char * filename = basename(url);
- FILE * outfile;
-
- if (stat(location, &statbuf) || !S_ISDIR(statbuf.st_mode))
- return _("Download directory does not exist");
-
- if (asprintf(&outfilename, "%s/%s", location, filename) == -1)
- return _("Out of memory\n");
-
- if (!stat(outfilename, &statbuf) && S_ISREG(statbuf.st_mode)) {
- curl_easy_setopt(curl, CURLOPT_RESUME_FROM, statbuf.st_size);
- } else {
- unlink(outfilename);
- curl_easy_setopt(curl, CURLOPT_RESUME_FROM, 0);
- }
-
- outfile = fopen(outfilename, "a");
- free(outfilename);
-
- if (!outfile)
- return _("Could not open output file in append mode");
-
- curl_easy_setopt(curl, CURLOPT_URL, url);
- curl_easy_setopt(curl, CURLOPT_FILE, outfile);
- curl_easy_setopt(curl, CURLOPT_NOPROGRESS, FALSE);
- curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, my_progress_func);
-
- /* needed for "insecure" SSL accesses (don't verify the peer's certificate) */
- curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
- /* allow Location: to be followed (needed for MandrakeClub) */
- curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, TRUE);
- /* when following Location:, allow to still send user+password when hostname changed (needed for Club) */
- curl_easy_setopt(curl, CURLOPT_NO_HOSTNAME_CHECK_BEFORE_AUTHENTICATION, TRUE);
-
- if (proxy && strcmp(proxy, ""))
- curl_easy_setopt(curl, CURLOPT_PROXY, proxy);
- if (proxy_user && strcmp(proxy_user, ""))
- curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, proxy_user);
-
- rescurl = curl_easy_perform(curl);
-
- if (rescurl == CURLE_ALREADY_COMPLETE)
- rescurl = CURLE_OK;
-
- fclose(outfile);
- curl_easy_cleanup(curl);
- }
-
- if (rescurl != CURLE_OK) {
- switch (rescurl) {
- case CURLE_UNSUPPORTED_PROTOCOL:
- return _("Unsupported protocol\n");
- break;
- case CURLE_FAILED_INIT:
- return _("Failed init\n");
- break;
- case CURLE_URL_MALFORMAT:
- return _("Bad URL format\n");
- break;
- case CURLE_URL_MALFORMAT_USER:
- return _("Bad user format in URL\n");
- break;
- case CURLE_COULDNT_RESOLVE_PROXY:
- return _("Couldn't resolve proxy\n");
- break;
- case CURLE_COULDNT_RESOLVE_HOST:
- return _("Couldn't resolve host\n");
- break;
- case CURLE_COULDNT_CONNECT:
- return _("Couldn't connect\n");
- break;
- case CURLE_FTP_WEIRD_SERVER_REPLY:
- return _("FTP unexpected server reply\n");
- break;
- case CURLE_FTP_ACCESS_DENIED:
- return _("FTP access denied\n");
- break;
- case CURLE_FTP_USER_PASSWORD_INCORRECT:
- return _("FTP user password incorrect\n");
- break;
- case CURLE_FTP_WEIRD_PASS_REPLY:
- return _("FTP unexpected PASS reply\n");
- break;
- case CURLE_FTP_WEIRD_USER_REPLY:
- return _("FTP unexpected USER reply\n");
- break;
- case CURLE_FTP_WEIRD_PASV_REPLY:
- return _("FTP unexpected PASV reply\n");
- break;
- case CURLE_FTP_WEIRD_227_FORMAT:
- return _("FTP unexpected 227 format\n");
- break;
- case CURLE_FTP_CANT_GET_HOST:
- return _("FTP can't get host\n");
- break;
- case CURLE_FTP_CANT_RECONNECT:
- return _("FTP can't reconnect\n");
- break;
- case CURLE_FTP_COULDNT_SET_BINARY:
- return _("FTP couldn't set binary\n");
- break;
- case CURLE_PARTIAL_FILE:
- return _("Partial file\n");
- break;
- case CURLE_FTP_COULDNT_RETR_FILE:
- return _("FTP couldn't RETR file\n");
- break;
- case CURLE_FTP_WRITE_ERROR:
- return _("FTP write error\n");
- break;
- case CURLE_FTP_QUOTE_ERROR:
- /* "quote" is an ftp command, not the typographic things, so
- * don't translate that word */
- return _("FTP quote error\n");
- break;
- case CURLE_HTTP_NOT_FOUND:
- return _("HTTP not found\n");
- break;
- case CURLE_WRITE_ERROR:
- return _("Write error\n");
- break;
- case CURLE_MALFORMAT_USER: /* the user name is illegally specified */
- return _("User name illegally specified\n");
- break;
- case CURLE_FTP_COULDNT_STOR_FILE: /* failed FTP upload */
- return _("FTP couldn't STOR file\n");
- break;
- case CURLE_READ_ERROR: /* could open/read from file */
- return _("Read error\n");
- break;
- case CURLE_OUT_OF_MEMORY:
- return _("Out of memory\n");
- break;
- case CURLE_OPERATION_TIMEOUTED: /* the timeout time was reached */
- return _("Time out\n");
- break;
- case CURLE_FTP_COULDNT_SET_ASCII: /* TYPE A failed */
- return _("FTP couldn't set ASCII\n");
- break;
- case CURLE_FTP_PORT_FAILED: /* FTP PORT operation failed */
- return _("FTP PORT failed\n");
- break;
- case CURLE_FTP_COULDNT_USE_REST: /* the REST command failed */
- return _("FTP couldn't use REST\n");
- break;
- case CURLE_FTP_COULDNT_GET_SIZE: /* the SIZE command failed */
- return _("FTP couldn't get size\n");
- break;
- case CURLE_HTTP_RANGE_ERROR: /* The RANGE "command" didn't seem to work */
- return _("HTTP range error\n");
- break;
- case CURLE_HTTP_POST_ERROR:
- return _("HTTP POST error\n");
- break;
- case CURLE_SSL_CONNECT_ERROR: /* something was wrong when connecting with SSL */
- return _("SSL connect error\n");
- break;
- case CURLE_FTP_BAD_DOWNLOAD_RESUME: /* couldn't resume download */
- return _("FTP bad download resume\n");
- break;
- case CURLE_FILE_COULDNT_READ_FILE:
- return _("File couldn't read file\n");
- break;
- case CURLE_LDAP_CANNOT_BIND:
- return _("LDAP cannot bind\n");
- break;
- case CURLE_LDAP_SEARCH_FAILED:
- return _("LDAP search failed\n");
- break;
- case CURLE_LIBRARY_NOT_FOUND:
- return _("Library not found\n");
- break;
- case CURLE_FUNCTION_NOT_FOUND:
- return _("Function not found\n");
- break;
- case CURLE_ABORTED_BY_CALLBACK:
- return _("Aborted by callback\n");
- break;
- case CURLE_BAD_FUNCTION_ARGUMENT:
- return _("Bad function argument\n");
- break;
- case CURLE_BAD_CALLING_ORDER:
- return _("Bad calling order\n");
- break;
- case CURLE_HTTP_PORT_FAILED:
- return _("HTTP Interface operation failed\n");
- break;
- case CURLE_BAD_PASSWORD_ENTERED:
- return _("my_getpass() returns fail\n");
- break;
- case CURLE_TOO_MANY_REDIRECTS :
- return _("catch endless re-direct loops\n");
- break;
- case CURLE_UNKNOWN_TELNET_OPTION:
- return _("User specified an unknown option\n");
- break;
- case CURLE_TELNET_OPTION_SYNTAX :
- return _("Malformed telnet option\n");
- break;
- case CURLE_OBSOLETE:
- return _("removed after 7.7.3\n");
- break;
- case CURLE_SSL_PEER_CERTIFICATE:
- return _("peer's certificate wasn't ok\n");
- break;
- case CURLE_GOT_NOTHING:
- return _("when this is a specific error\n");
- break;
- case CURLE_SSL_ENGINE_NOTFOUND:
- return _("SSL crypto engine not found\n");
- break;
- case CURLE_SSL_ENGINE_SETFAILED:
- return _("can not set SSL crypto engine as default\n");
- break;
- case CURLE_SEND_ERROR:
- return _("failed sending network data\n");
- break;
- case CURLE_RECV_ERROR:
- return _("failure in receiving network data\n");
- break;
- case CURLE_SHARE_IN_USE:
- return _("share is in use\n");
- break;
- case CURLE_SSL_CERTPROBLEM:
- return _("problem with the local certificate\n");
- break;
- case CURLE_SSL_CIPHER:
- return _("couldn't use specified cipher\n");
- break;
- case CURLE_SSL_CACERT:
- return _("problem with the CA cert (path?)\n");
- break;
- case CURLE_BAD_CONTENT_ENCODING:
- return _("Unrecognized transfer encoding\n");
- break;
-
-
- default:
- return my_asprintf(_("Unknown error code %d\n"), rescurl);
- break;
- }
- }
- return "";
-}
-
-
-/************************** Gateway to Perl ****************************/
-
-MODULE = curl_download PACKAGE = curl_download
-PROTOTYPES : DISABLE
-
-char *
-download_real(url, location, downloadprogress_callback, proxy, proxy_user)
- char * url
- char * location
- SV * downloadprogress_callback
- char * proxy
- char * proxy_user
- CODE:
- downloadprogress_callback_sv = downloadprogress_callback;
- RETVAL = download_url_real(url, location, proxy, proxy_user);
- OUTPUT:
- RETVAL
-