improved error handling in path_download
This commit is contained in:
parent
8f9935ee5d
commit
a76366c481
|
@ -1,6 +1,5 @@
|
||||||
# Binaries
|
# Binaries
|
||||||
httpdirfs
|
httpdirfs
|
||||||
sonicfs
|
|
||||||
|
|
||||||
# Intermediates
|
# Intermediates
|
||||||
*.o
|
*.o
|
||||||
|
@ -14,3 +13,6 @@ doc/html
|
||||||
.vscode
|
.vscode
|
||||||
*.c~
|
*.c~
|
||||||
*.h~
|
*.h~
|
||||||
|
|
||||||
|
#Others
|
||||||
|
mnt
|
||||||
|
|
|
@ -131,7 +131,7 @@ static void LinkTable_uninitialised_fill(LinkTable * linktbl)
|
||||||
{
|
{
|
||||||
int u;
|
int u;
|
||||||
char s[STATUS_LEN];
|
char s[STATUS_LEN];
|
||||||
lprintf(debug, "LinkTable_uninitialised_fill(): ... ");
|
lprintf(debug, " ... ");
|
||||||
do {
|
do {
|
||||||
u = 0;
|
u = 0;
|
||||||
for (int i = 0; i < linktbl->num; i++) {
|
for (int i = 0; i < linktbl->num; i++) {
|
||||||
|
@ -796,7 +796,7 @@ path_download(const char *path, char *output_buf, size_t req_size,
|
||||||
off_t offset)
|
off_t offset)
|
||||||
{
|
{
|
||||||
if (!path) {
|
if (!path) {
|
||||||
lprintf(fatal, "\npath_download(): NULL path supplied\n");
|
lprintf(fatal, "NULL path supplied\n");
|
||||||
}
|
}
|
||||||
Link *link;
|
Link *link;
|
||||||
link = path_to_Link(path);
|
link = path_to_Link(path);
|
||||||
|
@ -808,7 +808,7 @@ path_download(const char *path, char *output_buf, size_t req_size,
|
||||||
size_t end = start + req_size;
|
size_t end = start + req_size;
|
||||||
char range_str[64];
|
char range_str[64];
|
||||||
snprintf(range_str, sizeof(range_str), "%lu-%lu", start, end);
|
snprintf(range_str, sizeof(range_str), "%lu-%lu", start, end);
|
||||||
lprintf(debug, "path_download(%s, %s);\n", path, range_str);
|
lprintf(debug, "%s: %s\n", path, range_str);
|
||||||
|
|
||||||
TransferDataStruct buf;
|
TransferDataStruct buf;
|
||||||
buf.size = 0;
|
buf.size = 0;
|
||||||
|
@ -855,7 +855,7 @@ range requests\n");
|
||||||
/* The extra 1 byte is probably for '\0' */
|
/* The extra 1 byte is probably for '\0' */
|
||||||
if (recv - 1 == (long int) req_size) {
|
if (recv - 1 == (long int) req_size) {
|
||||||
recv--;
|
recv--;
|
||||||
} else {
|
} else if (offset + req_size < link->content_length) {
|
||||||
lprintf(error, "req_size: %lu, recv: %ld\n", req_size, recv);
|
lprintf(error, "req_size: %lu, recv: %ld\n", req_size, recv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -370,7 +370,7 @@ write_memory_callback(void *contents, size_t size, size_t nmemb,
|
||||||
memmove(&mem->data[mem->size], contents, realsize);
|
memmove(&mem->data[mem->size], contents, realsize);
|
||||||
mem->size += realsize;
|
mem->size += realsize;
|
||||||
mem->data[mem->size] = 0;
|
mem->data[mem->size] = 0;
|
||||||
lprintf(debug, "realsize %d bytes\n", realsize);
|
// lprintf(debug, "realsize %d bytes\n", realsize);
|
||||||
return realsize;
|
return realsize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue