From 9de9e9d1b3a3fe13b07d706a3aa476e6d42c5c15 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 4 Nov 2022 17:08:56 +0000 Subject: [PATCH] downloader: Use the URL check function from string.c Signed-off-by: Michael Tremer --- src/libpakfire/downloader.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/libpakfire/downloader.c b/src/libpakfire/downloader.c index 25086512d..d7c075182 100644 --- a/src/libpakfire/downloader.c +++ b/src/libpakfire/downloader.c @@ -95,19 +95,6 @@ struct pakfire_downloader { TAILQ_HEAD(transfers, pakfire_transfer) transfers; }; -static int pakfire_url_is_absolute(const char* url) { - if (pakfire_string_startswith(url, "https://")) - return 1; - - if (pakfire_string_startswith(url, "http://")) - return 1; - - if (pakfire_string_startswith(url, "file://")) - return 1; - - return 0; -} - static char* pakfire_url_join(const char* part1, const char* part2) { char* url = NULL; @@ -279,7 +266,7 @@ static struct pakfire_transfer* pakfire_downloader_create_transfer( baseurl = NULL; // Do not allow relative URLs when no mirrors are set - if (!pakfire_url_is_absolute(url) && !(mirrors || baseurl)) { + if (!pakfire_string_is_url(url) && !(mirrors || baseurl)) { ERROR(downloader->pakfire, "Relative URLs cannot be used without a baseurl and/or mirrorlist\n"); errno = EINVAL; return NULL; @@ -723,7 +710,7 @@ static int pakfire_downloader_prepare_transfer(struct pakfire_downloader* downlo transfer->tries++; // Simply set absolute URLs - if (pakfire_url_is_absolute(transfer->url)) { + if (pakfire_string_is_url(transfer->url)) { curl_easy_setopt(transfer->handle, CURLOPT_URL, transfer->url); // Join path if we are using mirrors -- 2.39.5