From 5d2b27de1cd0e276d7dc685ee3159d2d961da185 Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Wed, 28 Aug 2013 21:15:54 +0100
Subject: [PATCH] remove specialized asset loadings and use generic one.

---
 assets/html/main.html     | 12 +++----
 src/http/worker.c         |  3 +-
 src/http/worker/process.c | 66 ++++++++++-----------------------------
 3 files changed, 24 insertions(+), 57 deletions(-)
diff --git a/assets/html/main.html b/assets/html/main.html
index a61e444..1fad493 100644
--- a/assets/html/main.html
+++ b/assets/html/main.html
@@ -4,11 +4,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 	<head>
 		<title>My own little Web-App</title>
-		<link rel="stylesheet" type="text/css" href="/assets/style/common">
-		<script type="text/javascript" src="/assets/js/jquery"></script>
-		<script type="text/javascript" src="/assets/js/serverval"></script>
-		<script type="text/javascript" src="/assets/js/session"></script>
-		<script type="text/javascript" src="/assets/js/init"></script>
+		<link rel="stylesheet" type="text/css" href="/style/common.css">
+		<script type="text/javascript" src="/js/jquery.js"></script>
+		<script type="text/javascript" src="/js/serverval.js"></script>
+		<script type="text/javascript" src="/js/session.js"></script>
+		<script type="text/javascript" src="/js/init.js"></script>
 	</head>
 	<body> 
 		<ul id="menu">
@@ -40,7 +40,7 @@
 		<div id="main">
 			<h1>Testpage</h1>
 			Welcome<span></span>!!!<br />
-			<img src="/image/me" />
+			<img src="/image/waldschrat.jpg" />
 		</div>
 		<hr />
 		<div id="msg"></div>
diff --git a/src/http/worker.c b/src/http/worker.c
index 9abb59c..6791ada 100644
--- a/src/http/worker.c
+++ b/src/http/worker.c
@@ -82,7 +82,8 @@ httpWorkerCtor(void * _this, va_list * params)
 				nvalue = strlen(value);
 
 				if ('\n' == value[nvalue-1]) {
-					value[nvalue-1] = '\0';
+					nvalue--;
+					value[nvalue] = '\0';
 				}
 
 				hashAdd(this->mime_types,
diff --git a/src/http/worker/process.c b/src/http/worker/process.c
index 774a9ea..ea6877d 100644
--- a/src/http/worker/process.c
+++ b/src/http/worker/process.c
@@ -151,15 +151,7 @@ httpWorkerProcess(HttpWorker this, Stream st)
 			}
 
 			if (0 == strcmp("GET", request->method)) {
-
-				if (0 == strcmp("/", request->path)) {
-					response = httpWorkerGetAsset(
-							request,
-							"./assets/html/main.html",
-							CSTRA("text/html"));
-				}
-
-				else if (0 == strcmp("/sessinfo/", request->path)) {
+				if (0 == strcmp("/sessinfo/", request->path)) {
 					response = (HttpMessage)httpResponseSession(this->session);
 				}
 
@@ -182,20 +174,6 @@ httpWorkerProcess(HttpWorker this, Stream st)
 					}
 				}
 
-				else if (0 == strcmp("/image/me", request->path)) {
-					response = httpWorkerGetAsset(
-							request,
-							"./assets/image/waldschrat.jpg",
-							CSTRA("image/jpeg"));
-				}
-
-				else if (0 == strcmp("/assets/js/jquery", request->path)) {
-					response = httpWorkerGetAsset(
-							request,
-							"./assets/js/jquery-1.7.1.min.js",
-							CSTRA("text/javascript"));
-				}
-
 				else if (0 == strcmp("/assets/js/serverval", request->path)) {
 					response = httpWorkerGetAsset(
 							request,
@@ -203,36 +181,24 @@ httpWorkerProcess(HttpWorker this, Stream st)
 							CSTRA("text/javascript"));
 				}
 
-				else if (0 == strcmp("/assets/js/session", request->path)) {
-					response = httpWorkerGetAsset(
-							request,
-							"./assets/js/session.js",
-							CSTRA("text/javascript"));
-				}
-
-				else if (0 == strcmp("/assets/js/init", request->path)) {
-					response = httpWorkerGetAsset(
-							request,
-							"./assets/js/init.js",
-							CSTRA("text/javascript"));
-				}
-
-				else if (0 == strcmp("/assets/style/common", request->path)) {
-					response = httpWorkerGetAsset(
-							request,
-							"./assets/style/common.css",
-							CSTRA("text/css"));
-				}
-
 				else {
 					char html_asset[2048] = "./assets/html";
 					char base_asset[2048] = "./assets";
+					char main_asset[]     = "/main.html";
 
-					char * extension = strrchr(request->path, '.');
-					char * mime_type = NULL;
+					char * mime_type      = NULL;
 					char   default_mime[] = "application/octet-stream";
-					char * asset     = base_asset;
+					char * asset_path     = base_asset;
+					char * asset;
+					char * extension;
+
+					if (0 == strcmp("/", request->path)) {
+						asset = main_asset;
+					} else {
+						asset = request->path;
+					}
 
+					extension = strrchr(asset, '.');
 
 					if (NULL != extension) {
 						extension++;
@@ -241,17 +207,17 @@ httpWorkerProcess(HttpWorker this, Stream st)
 
 					if (NULL != mime_type &&
 							0 == memcmp(mime_type, CSTRA("text/html"))) {
-						asset = html_asset;
+						asset_path = html_asset;
 					}
 
 					if (NULL == mime_type) {
 						mime_type = default_mime;
 					}
 
-					strcat(asset, request->path);
+					strcat(asset_path, asset);
 					response = httpWorkerGetAsset(
 							request,
-							asset,
+							asset_path,
 							mime_type,
 							strlen(mime_type));
 				}
