projects / psensor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use glibtop instead of sysconf
[psensor.git] / src / server / server.c
diff --git a/src/server/server.c b/src/server/server.c
index cdd655d..ccb4d67 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -50,9 +50,8 @@ static const char *program_name;
 
 #define DEFAULT_PORT 3131
 
-#define PAGE_NOT_FOUND (_("<html><body><p>\
-Page not found - Go to <a href='/'>Main page</a>\
-</p></body>"))
+#define PAGE_NOT_FOUND (_("<html><body><p>"\
+"Page not found - Go to <a href='/'>Main page</a></p></body>"))
 
 static struct option long_options[] = {
        {"version", no_argument, 0, 'v'},
@@ -74,11 +73,11 @@ static int server_stop_requested;
 void print_version()
 {
        printf("psensor-server %s\n", VERSION);
-       printf(_("Copyright (C) %s jeanfi@gmail.com\n\
-License GPLv2: GNU GPL version 2 or later \
-<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n\
-This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.\n"),
+       printf(_("Copyright (C) %s jeanfi@gmail.com\n"
+                "License GPLv2: GNU GPL version 2 or later "
+                "<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
+                "This is free software: you are free to change and redistribute it.\n"
+                "There is NO WARRANTY, to the extent permitted by law.\n"),
               "2010-2011");
 }
 
@@ -91,16 +90,14 @@ void print_help()
 
        puts("");
        puts("Options:");
-       puts(_("\
-  -h, --help           display this help and exit\n\
-  -v, --version                display version information and exit"));
+       puts(_("  -h, --help            display this help and exit\n"
+              "  -v, --version         display version information and exit"));
 
        puts("");
 
-       puts(_("\
-  -d,--debug           run in debug mode\n\
-  -p,--port=PORT       webserver port\n\
-  -w,--wdir=DIR                directory containing webserver pages"));
+       puts(_("  -d,--debug            run in debug mode\n"
+              "  -p,--port=PORT        webserver port\n"
+              "  -w,--wdir=DIR         directory containing webserver pages"));
 
        puts("");
 
@@ -154,12 +151,9 @@ create_response_api(const char *nurl,
        char *page = NULL;
 
        if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS))  {
-
                page = sensors_to_json_string(server_data.sensors);
-
 #ifdef HAVE_GTOP
        } else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) {
-
                page = sysinfo_to_json_string(&server_data.psysinfo);
        } else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) {
                page = sensor_to_json_string(server_data.cpu_usage);
@@ -203,28 +197,33 @@ create_response_file(const char *nurl,
                     unsigned int *rp_code,
                     const char *fpath)
 {
-       if (is_file(fpath)) {
-               FILE *file = fopen(fpath, "rb");
+       struct stat st;
+       int ret;
+       FILE *file;
 
-               if (file) {
-                       struct stat buf;
+       ret = stat(fpath, &st);
+
+       if (!ret && (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))) {
+               file = fopen(fpath, "rb");
 
-                       stat(fpath, &buf);
+               if (file) {
                        *rp_code = MHD_HTTP_OK;
 
-                       if (!buf.st_size) {
+                       if (!st.st_size) {
                                fclose(file);
                                return MHD_create_response_from_data
                                        (0, NULL, MHD_NO, MHD_NO);
                        }
 
                        return MHD_create_response_from_callback
-                               (buf.st_size,
+                               (st.st_size,
                                 32 * 1024,
                                 &file_reader,
                                 file,
                                 (MHD_ContentReaderFreeCallback)&fclose);
 
+               } else {
+                       log_printf(LOG_ERR, "Failed to open: %s\n", fpath);
                }
        }
 
psensor