download: use str_concat

1 files changed, 11 insertions, 15 deletions

diff --git a/download.c b/download.c
index e80a51c..1153a41 100644
--- a/download.c
+++ b/download.c
@@ -82,8 +82,9 @@ download(struct kreq * r)
 	void   *buffer;
 	struct file *f;
 	int 	fd;
-	char 	file_path[PATH_MAX], request_path[PATH_MAX];
-	size_t 	path_size;
+	char 	file_path[PATH_MAX];
+	char   *path;
+	size_t 	path_size, suffix_len;
 	struct http_ret ret;
 
 	/* initialize empty file and return struct to success */
@@ -93,27 +94,20 @@ download(struct kreq * r)
 	};
 
 	/* build requested file path, with suffix or without */
-	if (strlen(r->suffix) > 0) {
-		if (snprintf(request_path, sizeof(request_path), "%s.%s", r->path, r->suffix)
-		    >= (int) sizeof(request_path)) {
+	suffix_len = strlen(r->suffix);
+	if (suffix_len > 0) {
+		if (str_concat(&path, r->path, ".", r->suffix, NULL) <= 0) {
 			ret = (struct http_ret) {
 				KHTTP_414,
-				"download: request too long"
+				"download: unable to build requested file path"
 			};
 			goto end;
 		}
 	} else {
-		if (snprintf(request_path, sizeof(request_path), "%s", r->path)
-		    >= (int) sizeof(request_path)) {
-			ret = (struct http_ret) {
-				KHTTP_414,
-				"download: request too long"
-			};
-			goto end;
-		}
+		path = r->path;
 	}
 	/* build file metadata */
-	f = file_new(request_path);
+	f = file_new(path);
 	if (f == NULL) {
 		ret = (struct http_ret) {
 			KHTTP_404,
@@ -170,6 +164,8 @@ download(struct kreq * r)
 
 	/* cleanup */
 end:
+	if (suffix_len > 0)
+		free(path);
 	if (f != NULL && f->size > 0)
 		munmap(buffer, f->size);
 	file_free(f);