rdelaage
/
httpdirfs
mirror of https://github.com/fangfufu/httpdirfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed spelling, ran through the formatter

This commit is contained in:
Fufu Fang 2024-01-13 12:28:27 +00:00
parent 35a213942c
commit 81aac8bb57
No known key found for this signature in database
GPG Key ID: 8A4CB08B0A7E27CE
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cache.c
View File

@ -164,10 +164,10 @@ static int Meta_read(Cache *cf)
} }
if (sizeof(long) != fread(&cf->time, sizeof(long), 1, fp) || if (sizeof(long) != fread(&cf->time, sizeof(long), 1, fp) ||
sizeof(off_t) != fread(&cf->content_length, sizeof(off_t), 1, fp) || sizeof(off_t) != fread(&cf->content_length, sizeof(off_t), 1, fp) ||
sizeof(int) != fread(&cf->blksz, sizeof(int), 1, fp) || sizeof(int) != fread(&cf->blksz, sizeof(int), 1, fp) ||
sizeof(long) != fread(&cf->segbc, sizeof(long), 1, fp) || sizeof(long) != fread(&cf->segbc, sizeof(long), 1, fp) ||
ferror(fp)) { ferror(fp)) {
lprintf(error, "error reading core metadata!\n"); lprintf(error, "error reading core metadata!\n");
return EIO; return EIO;
} }

33
src/link.c
View File

@ -286,7 +286,7 @@ LinkTable *LinkSystem_init(const char *url)
* This is where the '/' should be * This is where the '/' should be
*/ */
ROOT_LINK_OFFSET = strnlen(url, MAX_PATH_LEN) - ROOT_LINK_OFFSET = strnlen(url, MAX_PATH_LEN) -
((url[url_len] == '/') ? 1 : 0); ((url[url_len] == '/') ? 1 : 0);
/* /*
* --------------------- Enable cache system -------------------- * --------------------- Enable cache system --------------------
@ -474,7 +474,7 @@ static void LinkTable_fill(LinkTable *linktbl)
spaces in them!). If we only escaped it, and there were already spaces in them!). If we only escaped it, and there were already
encoded characters in it, then that would break the link. */ encoded characters in it, then that would break the link. */
char *unescaped_path = curl_easy_unescape(c, this_link->linkpath, 0, char *unescaped_path = curl_easy_unescape(c, this_link->linkpath, 0,
NULL); NULL);
char *escaped_path = curl_easy_escape(c, unescaped_path, 0); char *escaped_path = curl_easy_escape(c, unescaped_path, 0);
curl_free(unescaped_path); curl_free(unescaped_path);
/* Our code does the wrong thing if there's a trailing slash that's been /* Our code does the wrong thing if there's a trailing slash that's been
@ -704,7 +704,10 @@ int LinkTable_disk_save(LinkTable *linktbl, const char *dirn)
/* This is necessary to get the compiler on some platforms to stop /* This is necessary to get the compiler on some platforms to stop
complaining about the fact that we're not using the return value of complaining about the fact that we're not using the return value of
fread, when we know we aren't and that's fine. */ fread, when we know we aren't and that's fine. */
static inline void ignore_value(int i) { (void) i; } static inline void ignore_value(int i)
{
(void) i;
}
LinkTable *LinkTable_disk_open(const char *dirn) LinkTable *LinkTable_disk_open(const char *dirn)
{ {
@ -1032,8 +1035,8 @@ range requests\n");
lprintf(error, "%s", curl_easy_strerror(ret)); lprintf(error, "%s", curl_easy_strerror(ret));
} }
if ((http_resp != HTTP_OK) && if ((http_resp != HTTP_OK) &&
(http_resp != HTTP_PARTIAL_CONTENT) && (http_resp != HTTP_PARTIAL_CONTENT) &&
(http_resp != HTTP_RANGE_NOT_SATISFIABLE)) { (http_resp != HTTP_RANGE_NOT_SATISFIABLE)) {
char *url; char *url;
curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url); curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url);
lprintf(warning, "Could not download %s, HTTP %ld\n", url, http_resp); lprintf(warning, "Could not download %s, HTTP %ld\n", url, http_resp);
@ -1064,7 +1067,9 @@ long Link_download(Link *link, char *output_buf, size_t req_size, off_t offset)
header.data = NULL; header.data = NULL;
if (offset + req_size > link->content_length) { if (offset + req_size > link->content_length) {
lprintf(error, "requested size to large, req_size: %lu, recv: %ld, content-length: %ld\n", req_size, recv, link->content_length); lprintf(error,
"requested size too large, req_size: %lu, recv: %ld, content-length: %ld\n",
req_size, recv, link->content_length);
req_size = link->content_length - offset; req_size = link->content_length - offset;
} }
@ -1146,14 +1151,14 @@ static void make_link_relative(const char *page_url, char *link_url)
page_url++; page_url++;
} }
if (slashes_left_to_find) { if (slashes_left_to_find) {
if (slashes_left_to_find == 1 && ! *page_url) if (slashes_left_to_find == 1 && ! *page_url)
/* We're at the top level of the web site and the user entered the URL /* We're at the top level of the web site and the user entered the URL
without a trailing slash. */ without a trailing slash. */
page_url = "/"; page_url = "/";
else else
/* Well, that's odd. Let's return rather than trying to dig ourselves /* Well, that's odd. Let's return rather than trying to dig ourselves
deeper into whatever hole we're in. */ deeper into whatever hole we're in. */
return; return;
} }
/* The page URL is no longer the full page_url, it's just the part after /* The page URL is no longer the full page_url, it's just the part after
the host name. */ the host name. */