summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2011-01-14 12:17:39 -0500
committerDave Reisner <d@falconindy.com>2011-03-09 15:22:32 -0500
commita5b6a75787be01fc2a030b68eeaba07bc26db469 (patch)
tree591b4be9d2412f9facb165f3fd36f14248388953
parent159e1b06a50c7e80171d88933698f107a7f5773a (diff)
downloadpacman-a5b6a75787be01fc2a030b68eeaba07bc26db469.tar.xz
share code between libfetch and libcurl
no actual code changes here. change preprocessor logic to include get_tempfile, get_destfile, signal handler enum, and the interrupt handler logic when either HAVE_LIBCURL or HAVE_LIBFETCH are defined. Signed-off-by: Dave Reisner <d@falconindy.com>
-rw-r--r--lib/libalpm/dload.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index 4109e451..a08eda16 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -59,7 +59,7 @@ static char *get_filename(const char *url) {
return(filename);
}
-#ifdef HAVE_LIBFETCH
+#if defined(HAVE_LIBFETCH) || defined(HAVE_LIBCURL)
static char *get_destfile(const char *path, const char *filename) {
char *destfile;
/* len = localpath len + filename len + null */
@@ -80,6 +80,17 @@ static char *get_tempfile(const char *path, const char *filename) {
return(tempfile);
}
+#define check_stop() if(dload_interrupted) { ret = -1; goto cleanup; }
+enum sighandlers { OLD = 0, NEW = 1 };
+
+int dload_interrupted;
+static void inthandler(int signum)
+{
+ dload_interrupted = 1;
+}
+#endif
+
+#ifdef HAVE_LIBFETCH
static const char *fetch_gethost(struct url *fileurl)
{
const char *host = _("disk");
@@ -89,15 +100,6 @@ static const char *fetch_gethost(struct url *fileurl)
return(host);
}
-int dload_interrupted;
-static void inthandler(int signum)
-{
- dload_interrupted = 1;
-}
-
-#define check_stop() if(dload_interrupted) { ret = -1; goto cleanup; }
-enum sighandlers { OLD = 0, NEW = 1 };
-
static int fetch_download_internal(const char *url, const char *localpath,
int force) {
FILE *localf = NULL;