diff options
| author | kremlin <ian@kremlin.cc> | 2014-09-26 15:06:23 +0800 |
|---|---|---|
| committer | kremlin <ian@kremlin.cc> | 2014-09-26 15:06:23 +0800 |
| commit | 10ddceeb98322259fc13e3022ceeafc2191bb89d (patch) | |
| tree | d89a715be9e476da9926f86c70a0ace9f4485154 /src/interfaces/timedated/timedated.c | |
| parent | fe95904343623a78153b89fd1c2f1c0c4544c606 (diff) | |
| download | systembsd-10ddceeb98322259fc13e3022ceeafc2191bb89d.tar systembsd-10ddceeb98322259fc13e3022ceeafc2191bb89d.tar.gz systembsd-10ddceeb98322259fc13e3022ceeafc2191bb89d.tar.bz2 systembsd-10ddceeb98322259fc13e3022ceeafc2191bb89d.tar.lz systembsd-10ddceeb98322259fc13e3022ceeafc2191bb89d.tar.xz systembsd-10ddceeb98322259fc13e3022ceeafc2191bb89d.tar.zst systembsd-10ddceeb98322259fc13e3022ceeafc2191bb89d.zip | |
fixed logic/math bugs in set-time, still broken with GNOME tools
Diffstat (limited to 'src/interfaces/timedated/timedated.c')
| -rw-r--r-- | src/interfaces/timedated/timedated.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c index 41483a4..d5da851 100644 --- a/src/interfaces/timedated/timedated.c +++ b/src/interfaces/timedated/timedated.c @@ -68,7 +68,7 @@ on_handle_set_time(Timedate1 *td1_passed_interf, gboolean policykit_auth; check_auth_result is_authed; gboolean relative; /* relative if passed time_t is meant to be added to current time */ - struct timespec *new_time; + struct timespec new_time; params = g_dbus_method_invocation_get_parameters(invoc); g_variant_get(params, "(xbb)", &proposed_time, &relative, &policykit_auth); @@ -108,26 +108,23 @@ on_handle_set_time(Timedate1 *td1_passed_interf, } else if(relative) { - new_time = (struct timespec *) g_malloc0(sizeof(struct timespec)); cur_time = g_get_real_time(); - if(proposed_time < 0 && cur_time + proposed_time > proposed_time) { + if(proposed_time < 0 && cur_time + proposed_time > cur_time) { g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EINVAL", "Resultant time out of bounds."); return FALSE; - } else if(cur_time + proposed_time < proposed_time) { + } else if(proposed_time > 0 && cur_time + proposed_time < cur_time) { g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EINVAL", "Resultant time out of bounds."); return FALSE; } - new_time = (struct timespec *) g_malloc0(sizeof(struct timespec)); - new_time->tv_sec = proposed_time; - new_time->tv_nsec = 0; - g_ptr_array_add(timedated_freeable, new_time); + new_time.tv_sec = (cur_time + proposed_time) / 1000000; + new_time.tv_nsec = CLAMP((((cur_time + proposed_time) % 1000000) * 1000), 0, 1000000000); - if(!clock_settime(CLOCK_REALTIME, new_time)) { + if(!clock_settime(CLOCK_REALTIME, &new_time)) { timedate1_complete_set_time(td1_passed_interf, invoc); return TRUE; @@ -138,14 +135,12 @@ on_handle_set_time(Timedate1 *td1_passed_interf, return FALSE; } - } else if(proposed_time >= 0) { + } else if(proposed_time > 0) { - new_time = (struct timespec *) g_malloc0(sizeof(struct timespec)); - new_time->tv_sec = proposed_time; - new_time->tv_nsec = 0; - g_ptr_array_add(timedated_freeable, new_time); + new_time.tv_sec = (cur_time + proposed_time) / 1000000; + new_time.tv_nsec = CLAMP((((cur_time + proposed_time) % 1000000) * 1000), 0, 1000000000); - if(!clock_settime(CLOCK_REALTIME, new_time)) { + if(!clock_settime(CLOCK_REALTIME, &new_time)) { timedate1_complete_set_time(td1_passed_interf, invoc); return TRUE; |