X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=95998c8deb916813798042df837170f2600170c4;hp=f9ddad21640ae849e7a545059986afb0db0fa67b;hb=8b10426dcc0246c1712a99460dd470dcb1cc4d9c;hpb=bb4e19d49b0d2f608b73e96e6c6d10daed6c161a

diff --git a/src/server/server.c b/src/server/server.c
index f9ddad2..95998c8 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -23,6 +23,7 @@
 #include <libintl.h>
 #define _(str) gettext(str)
 
+#include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -64,15 +65,15 @@ static const int DEFAULT_PORT = 3131;
 "Page not found - Go to <a href='/'>Main page</a></p></body>"))
 
 static struct option long_options[] = {
-	{"version", no_argument, 0, 'v'},
-	{"help", no_argument, 0, 'h'},
-	{"port", required_argument, 0, 'p'},
-	{"wdir", required_argument, 0, 'w'},
-	{"debug", required_argument, 0, 'd'},
-	{"log-file", required_argument, 0, 'l'},
-	{"sensor-log-file", required_argument, 0, 0},
-	{"sensor-log-interval", required_argument, 0, 0},
-	{0, 0, 0, 0}
+	{"version", no_argument, NULL, 'v'},
+	{"help", no_argument, NULL, 'h'},
+	{"port", required_argument, NULL, 'p'},
+	{"wdir", required_argument, NULL, 'w'},
+	{"debug", required_argument, NULL, 'd'},
+	{"log-file", required_argument, NULL, 'l'},
+	{"sensor-log-file", required_argument, NULL, 0},
+	{"sensor-log-interval", required_argument, NULL, 0},
+	{NULL, 0, NULL, 0}
 };
 
 static struct server_data server_data;
@@ -81,7 +82,7 @@ static pthread_mutex_t mutex;
 
 static int server_stop_requested;
 
-static void print_version()
+static void print_version(void)
 {
 	printf("psensor-server %s\n", VERSION);
 	printf(_("Copyright (C) %s jeanfi@gmail.com\n"
@@ -92,7 +93,7 @@ static void print_version()
 	       "2010-2012");
 }
 
-static void print_help()
+static void print_help(void)
 {
 	printf(_("Usage: %s [OPTION]...\n"), program_name);
 
@@ -245,14 +246,25 @@ static struct MHD_Response *create_response_file(const char *nurl,
 static struct MHD_Response *
 create_response(const char *nurl, const char *method, unsigned int *rp_code)
 {
+	char *page, *fpath, *rpath;
 	struct MHD_Response *resp = NULL;
+	int n;
 
 	if (!strncmp(nurl, URL_BASE_API_1_1, strlen(URL_BASE_API_1_1))) {
 		resp = create_response_api(nurl, method, rp_code);
 	} else {
-		char *fpath = get_path(nurl, server_data.www_dir);
-
-		resp = create_response_file(nurl, method, rp_code, fpath);
+		fpath = get_path(nurl, server_data.www_dir);
+
+		rpath = realpath(fpath, NULL);
+		if (rpath) {
+			n = strlen(server_data.www_dir);
+			if (!strncmp(server_data.www_dir, rpath, n))
+				resp = create_response_file(nurl,
+							    method,
+							    rp_code,
+							    fpath);
+			free(rpath);
+		}
 
 		free(fpath);
 	}
@@ -260,7 +272,7 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code)
 	if (resp)
 		return resp;
 
-	char *page = strdup(PAGE_NOT_FOUND);
+	page = strdup(PAGE_NOT_FOUND);
 	*rp_code = MHD_HTTP_NOT_FOUND;
 
 	return MHD_create_response_from_data(strlen(page),
@@ -275,7 +287,8 @@ static int cbk_http_request(void *cls,
 			    const char *method,
 			    const char *version,
 			    const char *upload_data,
-			    size_t *upload_data_size, void **ptr)
+			    size_t *upload_data_size,
+			    void **ptr)
 {
 	static int dummy;
 	struct MHD_Response *response;
@@ -347,7 +360,7 @@ int main(int argc, char *argv[])
 		switch (optc) {
 		case 'w':
 			if (optarg)
-				server_data.www_dir = strdup(optarg);
+				server_data.www_dir = realpath(optarg, NULL);
 			break;
 		case 'p':
 			if (optarg)
@@ -386,8 +399,14 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 
-	if (!server_data.www_dir)
-		server_data.www_dir = strdup(DEFAULT_WWW_DIR);
+	if (!server_data.www_dir) {
+		server_data.www_dir = realpath(DEFAULT_WWW_DIR, NULL);
+		if (!server_data.www_dir) {
+			fprintf(stderr,
+				_("Webserver directory does not exist.\n"));
+			exit(EXIT_FAILURE);
+		}
+	}
 
 	if (!log_file)
 		log_file = strdup(DEFAULT_LOG_FILE);
@@ -396,8 +415,6 @@ int main(int argc, char *argv[])
 
 	log_open(log_file);
 
-	psensor_init();
-
 	hddtemp_psensor_list_append(&server_data.sensors, 600);
 
 	lmsensor_psensor_list_append(&server_data.sensors, 600);
@@ -440,7 +457,12 @@ int main(int argc, char *argv[])
 		sysinfo_update(&server_data.psysinfo);
 		cpu_usage_sensor_update(server_data.cpu_usage);
 #endif
-		psensor_list_update_measures(server_data.sensors);
+
+#ifdef HAVE_ATASMART
+		atasmart_psensor_list_update(server_data.sensors);
+#endif
+
+		hddtemp_psensor_list_update(server_data.sensors);
 
 		lmsensor_psensor_list_update(server_data.sensors);
 
@@ -460,7 +482,7 @@ int main(int argc, char *argv[])
 	psensor_free(server_data.cpu_usage);
 #endif
 	free(server_data.www_dir);
-	sensors_cleanup();
+	lmsensor_cleanup();
 
 #ifdef HAVE_GTOP
 	sysinfo_cleanup();