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,94 +1,95 @@ | |||
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); |
51 | } | 52 | } |
52 | if(w3c.empty()) continue; | 53 | if(w3c.empty()) continue; |
53 | if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d:%02d", | 54 | if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d:%02d", |
54 | &t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min,&t.tm_sec)!=6) | 55 | &t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min,&t.tm_sec)!=6) |
55 | throw exception("failed to parse w3c time"); | 56 | throw exception("failed to parse w3c time"); |
56 | --t.tm_mon;t.tm_year-=1900; | 57 | --t.tm_mon;t.tm_year-=1900; |
57 | time_t aa = mktime(&t); | 58 | time_t aa = mktime(&t); |
58 | if(aa==(time_t)-1) | 59 | if(aa==(time_t)-1) |
59 | throw exception("failed to mktime()"); | 60 | throw exception("failed to mktime()"); |
60 | almost_awakes.push_back(aa); | 61 | almost_awakes.push_back(aa); |
61 | } | 62 | } |
62 | } | 63 | } |
63 | 64 | ||
64 | const string hypnodata_t::w3c_to_bed() const { | 65 | const string hypnodata_t::w3c_to_bed() const { |
65 | return strftime("%Y-%m-%dT%H:%M",to_bed); } | 66 | return strftime("%Y-%m-%dT%H:%M",to_bed); } |
66 | const string hypnodata_t::w3c_alarm() const { | 67 | const string hypnodata_t::w3c_alarm() const { |
67 | return strftime("%Y-%m-%dT%H:%M",alarm); } | 68 | return strftime("%Y-%m-%dT%H:%M",alarm); } |
68 | const string hypnodata_t::w3c_almostawakes() const { | 69 | const string hypnodata_t::w3c_almostawakes() const { |
69 | string rv; | 70 | string rv; |
70 | for(vector<time_t>::const_iterator i=almost_awakes.begin();i!=almost_awakes.end();++i) { | 71 | for(vector<time_t>::const_iterator i=almost_awakes.begin();i!=almost_awakes.end();++i) { |
71 | if(!rv.empty()) | 72 | if(!rv.empty()) |
72 | rv += ','; | 73 | rv += ','; |
73 | rv += strftime("%Y-%m-%dT%H:%M:%S",*i); | 74 | rv += strftime("%Y-%m-%dT%H:%M:%S",*i); |
74 | } | 75 | } |
75 | return rv; | 76 | return rv; |
76 | } | 77 | } |
77 | 78 | ||
78 | const string hypnodata_t::str_to_bed() const { | 79 | const string hypnodata_t::str_to_bed() const { |
79 | return strftime("%H:%M",to_bed); } | 80 | return strftime("%H:%M",to_bed); } |
80 | const string hypnodata_t::str_alarm() const { | 81 | const string hypnodata_t::str_alarm() const { |
81 | return strftime("%H:%M",alarm); } | 82 | return strftime("%H:%M",alarm); } |
82 | const string hypnodata_t::str_date() const { | 83 | const string hypnodata_t::str_date() const { |
83 | return strftime("%Y-%m-%d, %a",alarm); } | 84 | return strftime("%Y-%m-%d, %a",alarm); } |
84 | const string hypnodata_t::str_data_a() const { | 85 | const string hypnodata_t::str_data_a() const { |
85 | char tmp[16]; | 86 | char tmp[16]; |
86 | snprintf(tmp,sizeof(tmp),"%d:%02d:%02d", | 87 | snprintf(tmp,sizeof(tmp),"%d:%02d:%02d", |
87 | data_a/3600, (data_a%3600)/60, | 88 | data_a/3600, (data_a%3600)/60, |
88 | data_a % 60 ); | 89 | data_a % 60 ); |
89 | return tmp; } | 90 | return tmp; } |
90 | 91 | ||
91 | time_t hypnodata_t::aligned_start() const { | 92 | time_t hypnodata_t::aligned_start() const { |
92 | return alarm - (alarm % (24*60*60)) - 24*60*60; } | 93 | return alarm - (alarm % (24*60*60)) - 24*60*60; } |
93 | 94 | ||
94 | } | 95 | } |
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,98 +1,99 @@ | |||
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) { |
51 | if(data_length < (sizeof(st_data_header_t)+sizeof(st_data_footer_t))) | 52 | if(data_length < (sizeof(st_data_header_t)+sizeof(st_data_footer_t))) |
52 | throw exception_st_data_envelope("not enough sleeptracker data to decode"); | 53 | throw exception_st_data_envelope("not enough sleeptracker data to decode"); |
53 | st_data_header_t *h = (st_data_header_t*)data; | 54 | st_data_header_t *h = (st_data_header_t*)data; |
54 | if(h->magic != 'V') | 55 | if(h->magic != 'V') |
55 | throw exception_st_data_envelope("invalid magic in the data"); | 56 | throw exception_st_data_envelope("invalid magic in the data"); |
56 | st_data_footer_t *f = (st_data_footer_t*)(static_cast<const char *>(data)+data_length-sizeof(st_data_footer_t)); | 57 | st_data_footer_t *f = (st_data_footer_t*)(static_cast<const char *>(data)+data_length-sizeof(st_data_footer_t)); |
57 | if( (std::accumulate((uint8_t*)&h->today,(uint8_t*)&f->checksum,0)&0xFF) != f->checksum ) | 58 | if( (std::accumulate((uint8_t*)&h->today,(uint8_t*)&f->checksum,0)&0xFF) != f->checksum ) |
58 | throw exception_st_data_integrity("checksum mismatch"); | 59 | throw exception_st_data_integrity("checksum mismatch"); |
59 | st_fulltime_t *aawake = (st_fulltime_t*)&h[1]; | 60 | st_fulltime_t *aawake = (st_fulltime_t*)&h[1]; |
60 | if((void*)&aawake[h->nawakes] != (void*)f) | 61 | if((void*)&aawake[h->nawakes] != (void*)f) |
61 | throw exception_st_data_envelope("unbelievably screwed up data"); | 62 | throw exception_st_data_envelope("unbelievably screwed up data"); |
62 | rv.clear(); | 63 | rv.clear(); |
63 | time_t now = time(0); | 64 | time_t now = time(0); |
64 | struct tm t; | 65 | struct tm t; |
65 | if(!localtime_r(&now,&t)) | 66 | if(!localtime_r(&now,&t)) |
66 | throw exception_st_data("failed to localtime_r()"); | 67 | throw exception_st_data("failed to localtime_r()"); |
67 | t.tm_mon = h->today.month-1; | 68 | t.tm_mon = h->today.month-1; |
68 | t.tm_mday = h->today.day; | 69 | t.tm_mday = h->today.day; |
69 | time_t mkt = mktime(&t); | 70 | time_t mkt = mktime(&t); |
70 | if(mkt == (time_t)-1) | 71 | if(mkt == (time_t)-1) |
71 | throw exception_st_data("failed to mktime() for a timestamp"); | 72 | throw exception_st_data("failed to mktime() for a timestamp"); |
72 | if(mkt > now) { | 73 | if(mkt > now) { |
73 | --t.tm_year; | 74 | --t.tm_year; |
74 | } | 75 | } |
75 | struct tm ta; | 76 | struct tm ta; |
76 | memmove(&ta,&t,sizeof(ta)); | 77 | memmove(&ta,&t,sizeof(ta)); |
77 | ta.tm_sec = 0; | 78 | ta.tm_sec = 0; |
78 | ta.tm_hour = h->alarm.hour; ta.tm_min = h->alarm.min; | 79 | ta.tm_hour = h->alarm.hour; ta.tm_min = h->alarm.min; |
79 | rv.alarm = mktime(&ta); | 80 | rv.alarm = mktime(&ta); |
80 | if(rv.alarm == (time_t)-1) | 81 | if(rv.alarm == (time_t)-1) |
81 | throw exception_st_data("failed to mktime() for alarm"); | 82 | throw exception_st_data("failed to mktime() for alarm"); |
82 | struct tm tb; | 83 | struct tm tb; |
83 | memmove(&tb,&ta,sizeof(tb)); | 84 | memmove(&tb,&ta,sizeof(tb)); |
84 | tb.tm_hour = h->to_bed.hour; tb.tm_min = h->to_bed.min; | 85 | tb.tm_hour = h->to_bed.hour; tb.tm_min = h->to_bed.min; |
85 | rv.to_bed = mktime(&tb); | 86 | rv.to_bed = mktime(&tb); |
86 | if(rv.to_bed == (time_t)-1) | 87 | if(rv.to_bed == (time_t)-1) |
87 | throw exception_st_data("failed to mktime() for 'to bed'"); | 88 | throw exception_st_data("failed to mktime() for 'to bed'"); |
88 | if(rv.to_bed > rv.alarm) { | 89 | if(rv.to_bed > rv.alarm) { |
89 | back_a_day(tb); | 90 | back_a_day(tb); |
90 | rv.to_bed -= 24*60*60; | 91 | rv.to_bed -= 24*60*60; |
91 | } | 92 | } |
92 | struct tm taaw; | 93 | struct tm taaw; |
93 | memmove(&taaw,&tb,sizeof(taaw)); | 94 | memmove(&taaw,&tb,sizeof(taaw)); |
94 | for(int rest=h->nawakes;rest;--rest,++aawake) { | 95 | for(int rest=h->nawakes;rest;--rest,++aawake) { |
95 | if( | 96 | if( |
96 | taaw.tm_mday!=ta.tm_mday | 97 | taaw.tm_mday!=ta.tm_mday |
97 | && ( | 98 | && ( |
98 | aawake->hour < tb.tm_hour | 99 | aawake->hour < tb.tm_hour |