From a76366c4811994c61b8c42a63beca89bcea567b2 Mon Sep 17 00:00:00 2001
From: Fufu Fang <fangfufu2003@gmail.com>
Date: Wed, 1 Sep 2021 11:03:27 +0100
Subject: [PATCH] improved error handling in path_download

---
 .gitignore    | 4 +++-
 src/link.c    | 8 ++++----
 src/network.c | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07caae5..b3d55ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 # Binaries
 httpdirfs
-sonicfs
 
 # Intermediates
 *.o
@@ -14,3 +13,6 @@ doc/html
 .vscode
 *.c~
 *.h~
+
+#Others
+mnt
diff --git a/src/link.c b/src/link.c
index 4271071..864735e 100644
--- a/src/link.c
+++ b/src/link.c
@@ -131,7 +131,7 @@ static void LinkTable_uninitialised_fill(LinkTable * linktbl)
 {
     int u;
     char s[STATUS_LEN];
-    lprintf(debug, "LinkTable_uninitialised_fill(): ... ");
+    lprintf(debug, " ... ");
     do {
         u = 0;
         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)
 {
     if (!path) {
-        lprintf(fatal, "\npath_download(): NULL path supplied\n");
+        lprintf(fatal, "NULL path supplied\n");
     }
     Link *link;
     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;
     char range_str[64];
     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;
     buf.size = 0;
@@ -855,7 +855,7 @@ range requests\n");
     /* The extra 1 byte is probably for '\0' */
     if (recv - 1 == (long int) req_size) {
         recv--;
-    } else {
+    } else if (offset + req_size < link->content_length) {
         lprintf(error, "req_size: %lu, recv: %ld\n", req_size, recv);
     }
 
diff --git a/src/network.c b/src/network.c
index 10f3423..86c5e07 100644
--- a/src/network.c
+++ b/src/network.c
@@ -370,7 +370,7 @@ write_memory_callback(void *contents, size_t size, size_t nmemb,
     memmove(&mem->data[mem->size], contents, realsize);
     mem->size += realsize;
     mem->data[mem->size] = 0;
-    lprintf(debug, "realsize %d bytes\n", realsize);
+    // lprintf(debug, "realsize %d bytes\n", realsize);
     return realsize;
 }