author | Michael Krelin <hacker@klever.net> | 2009-12-12 00:21:52 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-12-12 00:21:52 (UTC) |
commit | 29ab361797d5677ce3296555efa7fe34dedaf0d4 (patch) (unidiff) | |
tree | f0b328c790ddb405e56aa4c1653a73cbadd8135f | |
parent | f888c15a5df36dcd767823cf5c223540270524c3 (diff) | |
download | napkin-29ab361797d5677ce3296555efa7fe34dedaf0d4.zip napkin-29ab361797d5677ce3296555efa7fe34dedaf0d4.tar.gz napkin-29ab361797d5677ce3296555efa7fe34dedaf0d4.tar.bz2 |
Thanks to Kevin Turner for spotting and patching it.
-rw-r--r-- | lib/hypnodata.cc | 5 | ||||
-rw-r--r-- | lib/st-decode.cc | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/hypnodata.cc b/lib/hypnodata.cc index a64b7d7..376c7ff 100644 --- a/lib/hypnodata.cc +++ b/lib/hypnodata.cc | |||
@@ -1,50 +1,51 @@ | |||
1 | #include <stdlib.h> | 1 | #include <cstdio> |
2 | #include <string.h> | 2 | #include <cstdlib> |
3 | #include <cstring> | ||
3 | #include <napkin/exception.h> | 4 | #include <napkin/exception.h> |
4 | #include <napkin/util.h> | 5 | #include <napkin/util.h> |
5 | #include <napkin/types.h> | 6 | #include <napkin/types.h> |
6 | 7 | ||
7 | namespace napkin { | 8 | namespace napkin { |
8 | 9 | ||
9 | void hypnodata_t::clear() { | 10 | void hypnodata_t::clear() { |
10 | to_bed = alarm = 0; | 11 | to_bed = alarm = 0; |
11 | data_a = window = 0; | 12 | data_a = window = 0; |
12 | almost_awakes.clear(); | 13 | almost_awakes.clear(); |
13 | } | 14 | } |
14 | 15 | ||
15 | static time_t from_minute_w3c(const string& w3c) { | 16 | static time_t from_minute_w3c(const string& w3c) { |
16 | struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1; | 17 | struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1; |
17 | if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d", | 18 | if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d", |
18 | &t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min)!=5) | 19 | &t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min)!=5) |
19 | throw exception("failed to parse w3c time"); | 20 | throw exception("failed to parse w3c time"); |
20 | --t.tm_mon;t.tm_year-=1900; | 21 | --t.tm_mon;t.tm_year-=1900; |
21 | time_t rv = mktime(&t); | 22 | time_t rv = mktime(&t); |
22 | if(rv==(time_t)-1) | 23 | if(rv==(time_t)-1) |
23 | throw exception("failed to mktime()"); | 24 | throw exception("failed to mktime()"); |
24 | return rv; | 25 | return rv; |
25 | } | 26 | } |
26 | 27 | ||
27 | void hypnodata_t::set_to_bed(const string& w3c) { | 28 | void hypnodata_t::set_to_bed(const string& w3c) { |
28 | to_bed = from_minute_w3c(w3c); } | 29 | to_bed = from_minute_w3c(w3c); } |
29 | void hypnodata_t::set_alarm(const string& w3c) { | 30 | void hypnodata_t::set_alarm(const string& w3c) { |
30 | alarm = from_minute_w3c(w3c); } | 31 | alarm = from_minute_w3c(w3c); } |
31 | void hypnodata_t::set_window(const string& str) { | 32 | void hypnodata_t::set_window(const string& str) { |
32 | window = strtol(str.c_str(),0,10); /* TODO: check for error */ | 33 | window = strtol(str.c_str(),0,10); /* TODO: check for error */ |
33 | } | 34 | } |
34 | void hypnodata_t::set_data_a(const string& str) { | 35 | void hypnodata_t::set_data_a(const string& str) { |
35 | data_a = strtol(str.c_str(),0,10); /* TODO: check for error */ | 36 | data_a = strtol(str.c_str(),0,10); /* TODO: check for error */ |
36 | } | 37 | } |
37 | void hypnodata_t::set_almost_awakes(const string& str) { | 38 | void hypnodata_t::set_almost_awakes(const string& str) { |
38 | almost_awakes.clear(); | 39 | almost_awakes.clear(); |
39 | static const char *significants = "0123456789-T:Z"; | 40 | static const char *significants = "0123456789-T:Z"; |
40 | string::size_type p = str.find_first_of(significants); | 41 | string::size_type p = str.find_first_of(significants); |
41 | struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1; | 42 | struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1; |
42 | while(p!=string::npos) { | 43 | while(p!=string::npos) { |
43 | string::size_type ns = str.find_first_not_of(significants,p); | 44 | string::size_type ns = str.find_first_not_of(significants,p); |
44 | string w3c; | 45 | string w3c; |
45 | if(ns==string::npos) { | 46 | if(ns==string::npos) { |
46 | w3c = str.substr(p); | 47 | w3c = str.substr(p); |
47 | p = string::npos; | 48 | p = string::npos; |
48 | }else{ | 49 | }else{ |
49 | w3c = str.substr(p,ns-p); | 50 | w3c = str.substr(p,ns-p); |
50 | p = str.find_first_of(significants,ns); | 51 | p = str.find_first_of(significants,ns); |
diff --git a/lib/st-decode.cc b/lib/st-decode.cc index b354250..81cbb8f 100644 --- a/lib/st-decode.cc +++ b/lib/st-decode.cc | |||
@@ -1,50 +1,51 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdint.h> |
2 | #include <string.h> | 2 | #include <cstdlib> |
3 | #include <cstring> | ||
3 | #include <stdexcept> | 4 | #include <stdexcept> |
4 | #include <numeric> | 5 | #include <numeric> |
5 | #include <napkin/exception.h> | 6 | #include <napkin/exception.h> |
6 | #include <napkin/st/decode.h> | 7 | #include <napkin/st/decode.h> |
7 | 8 | ||
8 | namespace napkin { | 9 | namespace napkin { |
9 | namespace sleeptracker { | 10 | namespace sleeptracker { |
10 | using std::invalid_argument; | 11 | using std::invalid_argument; |
11 | using std::runtime_error; | 12 | using std::runtime_error; |
12 | 13 | ||
13 | struct st_time_t { | 14 | struct st_time_t { |
14 | uint8_t hour; | 15 | uint8_t hour; |
15 | uint8_t min; | 16 | uint8_t min; |
16 | }; | 17 | }; |
17 | struct st_date_t { | 18 | struct st_date_t { |
18 | uint8_t month; | 19 | uint8_t month; |
19 | uint8_t day; | 20 | uint8_t day; |
20 | uint8_t dow; | 21 | uint8_t dow; |
21 | }; | 22 | }; |
22 | struct st_fulltime_t { | 23 | struct st_fulltime_t { |
23 | uint8_t hour; | 24 | uint8_t hour; |
24 | uint8_t min; | 25 | uint8_t min; |
25 | uint8_t sec; | 26 | uint8_t sec; |
26 | }; | 27 | }; |
27 | struct st_data_header_t { | 28 | struct st_data_header_t { |
28 | char magic; | 29 | char magic; |
29 | st_date_t today; | 30 | st_date_t today; |
30 | uint8_t window; | 31 | uint8_t window; |
31 | st_time_t to_bed; | 32 | st_time_t to_bed; |
32 | st_time_t alarm; | 33 | st_time_t alarm; |
33 | uint8_t nawakes; | 34 | uint8_t nawakes; |
34 | }; | 35 | }; |
35 | struct st_data_footer_t { | 36 | struct st_data_footer_t { |
36 | uint16_t data_a; | 37 | uint16_t data_a; |
37 | uint8_t checksum; | 38 | uint8_t checksum; |
38 | uint8_t eof_mark; | 39 | uint8_t eof_mark; |
39 | }; | 40 | }; |
40 | 41 | ||
41 | static void back_a_day(struct tm& t) { | 42 | static void back_a_day(struct tm& t) { |
42 | time_t ts = mktime(&t); | 43 | time_t ts = mktime(&t); |
43 | if(ts==(time_t)-1) | 44 | if(ts==(time_t)-1) |
44 | throw exception_st_data("failed to make up time to step back a day"); | 45 | throw exception_st_data("failed to make up time to step back a day"); |
45 | ts -= 60*60*24; | 46 | ts -= 60*60*24; |
46 | if(!localtime_r(&ts,&t)) | 47 | if(!localtime_r(&ts,&t)) |
47 | throw exception_st_data("failed to localtime_r() while stepping back a day"); | 48 | throw exception_st_data("failed to localtime_r() while stepping back a day"); |
48 | } | 49 | } |
49 | 50 | ||
50 | hypnodata_t& decode(hypnodata_t& rv,const void *data,size_t data_length) { | 51 | hypnodata_t& decode(hypnodata_t& rv,const void *data,size_t data_length) { |