X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=breezed.git;a=blobdiff_plain;f=breezed.cc;h=4f2302d0484bca579e6856e95824a29de94e48fb;hp=c958b13d2687f12a6c4b48b6323f494dcb0528fb;hb=62f9018cb6a5ba63cbce4df55c4dc77d71056320;hpb=29d922d3b115ae81e076e9fc03e5ea986fc42630 diff --git a/breezed.cc b/breezed.cc index c958b13..4f2302d 100644 --- a/breezed.cc +++ b/breezed.cc @@ -3,8 +3,8 @@ breezed is a fan speed control daemon for Linux computers. - Copyright (c) 2008 Francois Fleuret - Written by Francois Fleuret + Copyright (c) 2008, 2009 Francois Fleuret + Written by Francois Fleuret This file is part of breezed. @@ -37,11 +37,11 @@ using namespace std; const int major_version_number = 1; -const int minor_version_number = 1; +const int minor_version_number = 2; const int buffer_size = 1024; -const char *default_confguration_file = "/etc/breezed.conf"; +const char *default_configuration_file = "/etc/breezed.conf"; // The time period to check the temperature. const int polling_delay = 5; @@ -61,7 +61,7 @@ int last_level = -1; int file_fan_fd; -int nb_temperature_thresholds = 0; +int nb_temperature_thresholds; int *temperature_thresholds = 0; int nb_file_thermal = 0; @@ -148,6 +148,8 @@ void define_temperature_thresholds(char *definition) { exit(1); } + nb_temperature_thresholds = 1; + char *s; s = definition; while(s) { @@ -157,8 +159,10 @@ void define_temperature_thresholds(char *definition) { temperature_thresholds = new int[nb_temperature_thresholds]; + temperature_thresholds[0] = -1; + s = definition; - int k = 0; + int k = 1; while(s) { s = next_word(token, s, buffer_size); temperature_thresholds[k] = atoi(token); @@ -170,8 +174,6 @@ void define_temperature_thresholds(char *definition) { } k++; } - - temperature_thresholds[0] = -1; } ////////////////////////////////////////////////////////////////////// @@ -180,8 +182,8 @@ int main(int argc, char **argv) { char buffer[buffer_size], token[buffer_size]; - configuration_file = new char[strlen(default_confguration_file) + 1]; - strcpy(configuration_file, default_confguration_file); + configuration_file = new char[strlen(default_configuration_file) + 1]; + strcpy(configuration_file, default_configuration_file); int i = 1; while(i < argc) { @@ -319,6 +321,7 @@ Written by Francois Fleuret (francois@fleuret.org).\n"; if(configuration_file) { ifstream cf(configuration_file); + if(cf.fail()) { cerr << "Can not open " << configuration_file << " for reading." << endl; exit(1);