[acquire/tests/test_*.h] Increase test coverage ; [*.h,cli/cli{.h,.c}] Modify code fixing issues test failures found ; [reports/test_coverage.svg] Regenerate on latest ctest run

Author: SamuelMarks

acquire/acquire_libcurl.h

@@ -209,7 +209,11 @@ enum acquire_status acquire_download_async_poll(struct acquire_handle *handle) {
         } else {
           curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE,
                             &response_code);
-          if (response_code >= 400) {
+          if (msg->data.result == CURLE_COULDNT_RESOLVE_HOST) {
+            acquire_handle_set_error(handle, ACQUIRE_ERROR_HOST_NOT_FOUND,
+                                     "Could not resolve host: %s",
+                                     curl_easy_strerror(msg->data.result));
+          } else if (response_code >= 400) {
             acquire_handle_set_error(handle, ACQUIRE_ERROR_HTTP_FAILURE,
                                      "HTTP error: %ld", response_code);
           } else {

acquire/acquire_librhash.h

@@ -77,7 +77,7 @@ int _librhash_verify_async_start(struct acquire_handle *handle,
     break;
   case LIBACQUIRE_SHA512:
     rhash_algo_id = RHASH_SHA512;
-    expected_len = 128;
+    expected_len = 129;
     break;
   default:
     return -1;

acquire/acquire_url_utils.h

@@ -68,9 +68,11 @@ char *get_path_from_url(const char *url) {
     return NULL;
 
   last_slash = strrchr(url, '/');
-  if (last_slash)
+  if (last_slash) {
+    if ((last_slash - url) < 9)
+      return strdup("");
     last_slash++;
-  else
+  } else
     last_slash = url;
 
   end = last_slash;
@@ -90,20 +92,12 @@ char *get_path_from_url(const char *url) {
 }
 
 bool is_url(const char *maybe_url) {
-  if (maybe_url == NULL || strlen(maybe_url) < 8)
-    return false;
-  else if (maybe_url[0] == 'h' && maybe_url[1] == 't' && maybe_url[2] == 't' &&
-           maybe_url[3] == 'p')
-    return (maybe_url[4] == ':' && maybe_url[5] == '/' &&
-            maybe_url[6] == '/') ||
-           (maybe_url[4] == 's' && maybe_url[5] == ':' && maybe_url[6] == '/' &&
-            maybe_url[7] == '/');
-  else if (maybe_url[0] == 'f' && maybe_url[1] == 't' && maybe_url[2] == 'p')
-    return (maybe_url[3] == ':' && maybe_url[4] == '/' &&
-            maybe_url[5] == '/') ||
-           (maybe_url[3] == 's' && maybe_url[4] == ':' && maybe_url[5] == '/' &&
-            maybe_url[6] == '/');
-  return false /* strchr(maybe_url, '/') != NULL */;
+  return maybe_url != NULL && strlen(maybe_url) > 5 &&
+         (strncasecmp(maybe_url, "http://", 7) == 0 ||
+          strncasecmp(maybe_url, "https://", 8) == 0 ||
+          strncasecmp(maybe_url, "ftp://", 6) == 0 ||
+          strncasecmp(maybe_url, "ftps://", 7) == 0 ||
+          strncasecmp(maybe_url, "file://", 7) == 0);
 }
 
 #endif /* defined(LIBACQUIRE_IMPLEMENTATION) &&                                \