From 8ef18e36a16625db16f2b39abfd4a19607bcf9fa Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 23 Oct 2019 22:25:36 -0500 Subject: fetch: Finish implementing --- fetch/CMakeLists.txt | 7 +++++++ fetch/fetch.cc | 45 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 3 deletions(-) (limited to 'fetch') diff --git a/fetch/CMakeLists.txt b/fetch/CMakeLists.txt index 7f83a36..e445dee 100644 --- a/fetch/CMakeLists.txt +++ b/fetch/CMakeLists.txt @@ -1,8 +1,15 @@ +pkg_check_modules(CURL libcurl) + set(FETCH_SRCS fetch.cc ) add_executable(hscript-fetch ${FETCH_SRCS}) +IF(CURL_FOUND) + add_definitions(-DHAVE_LIBCURL) + target_link_libraries(hscript-fetch ${CURL_LIBRARIES}) +ENDIF(CURL_FOUND) + install(TARGETS hscript-fetch DESTINATION bin) IF(RSPEC_EXECUTABLE) diff --git a/fetch/fetch.cc b/fetch/fetch.cc index 941051f..5f696be 100644 --- a/fetch/fetch.cc +++ b/fetch/fetch.cc @@ -11,6 +11,11 @@ #include /* transform */ #include /* EXIT_* */ +#ifdef HAVE_LIBCURL +# include /* strerror */ +# include /* curl_* */ +# include /* errno */ +#endif /* HAVE_LIBCURL */ #include #include #include @@ -54,7 +59,7 @@ int process_local(const std::string &path) { } if(input.fail() && !input.eof()) { - output_error("process_local", "line length error reading " + path); + output_error("process_local", "line too long while reading " + path); return EXIT_FAILURE; } if(input.bad() && !input.eof()) { @@ -66,12 +71,44 @@ int process_local(const std::string &path) { } +#ifdef HAVE_LIBCURL /*! Download an installfile using cURL. * @param path The remote path to download. */ int process_curl(const std::string &path) { - return EXIT_FAILURE; + CURL *curl = curl_easy_init(); + CURLcode result; + int return_code = EXIT_FAILURE; + char errbuf[CURL_ERROR_SIZE]; + FILE *fp; + + if(curl == nullptr) { + output_error("internal", "trouble initialising cURL library"); + return EXIT_FAILURE; + } + + fp = fopen(IFILE_PATH, "w"); + if(fp == nullptr) { + output_error("internal", "couldn't open " + std::string(IFILE_PATH) + + " for writing", strerror(errno)); + curl_easy_cleanup(curl); + return EXIT_FAILURE; + } + + curl_easy_setopt(curl, CURLOPT_URL, path.c_str()); + curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp); + + result = curl_easy_perform(curl); + if(result == CURLE_OK) { + return_code = EXIT_SUCCESS; + } else { + output_error("curl", "couldn't download installfile", errbuf); + } + curl_easy_cleanup(curl); + return return_code; } +#endif /* HAVE_LIBCURL */ /*! The signature of a protocol dispatch function */ @@ -80,9 +117,11 @@ typedef int (*proto_dispatch_fn)(const std::string &); /*! Protocol handlers */ static const std::map protos = { +#ifdef HAVE_LIBCURL {"http", process_curl}, {"https", process_curl}, - {"tftp", process_curl} + {"tftp", process_curl}, +#endif /* HAVE_LIBCURL */ }; -- cgit v1.2.3-60-g2f50