/*
- * Copyright (C) 2010-2011 jeanfi@gmail.com
+ * Copyright (C) 2010-2012 jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
#include "psensor_json.h"
#include "url.h"
-#include "p_io.h"
#include "server.h"
static const char *program_name;
"<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");
+ "2010-2012");
}
void print_help()
if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS)) {
page = sensors_to_json_string(server_data.sensors);
#ifdef HAVE_GTOP
-#ifdef HAVE_SYSINFO_FCT
} else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) {
page = sysinfo_to_json_string(&server_data.psysinfo);
-#endif
} else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) {
page = sensor_to_json_string(server_data.cpu_usage);
#endif
textdomain(PACKAGE);
#endif
- server_data.www_dir = DEFAULT_WWW_DIR;
+ server_data.www_dir = NULL;
server_data.psysinfo.interfaces = NULL;
while ((optc = getopt_long(argc, argv,
}
}
+ server_data.www_dir = strdup(DEFAULT_WWW_DIR);
+
if (!cmdok || optind != argc) {
fprintf(stderr, _("Try `%s --help' for more information.\n"),
program_name);
pthread_mutex_lock(&mutex);
#ifdef HAVE_GTOP
-#ifdef HAVE_SYSINFO_FCT
sysinfo_update(&server_data.psysinfo);
-#endif
cpu_usage_sensor_update(server_data.cpu_usage);
#endif
psensor_list_update_measures(server_data.sensors);
sensors_cleanup();
#ifdef HAVE_GTOP
-#ifdef HAVE_SYSINFO_FCT
sysinfo_cleanup();
-#endif
cpu_cleanup();
#endif