projects
/
systembsd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fe95904
)
fixed logic/math bugs in set-time, still broken with GNOME tools
author
kremlin
<ian@kremlin.cc>
Fri, 26 Sep 2014 07:06:23 +0000
(
03:06
-0400)
committer
kremlin
<ian@kremlin.cc>
Fri, 26 Sep 2014 07:06:23 +0000
(
03:06
-0400)
src/interfaces/timedated/timedated.c
patch
|
blob
|
blame
|
history
diff --git
a/src/interfaces/timedated/timedated.c
b/src/interfaces/timedated/timedated.c
index 41483a4ac162d7b46534c9d4fb406dd64f5a61c8..d5da851d59a05f9f495b02d6685f9a75f8569614 100644
(file)
--- 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 */
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);
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) {
} else if(relative) {
- new_time = (struct timespec *) g_malloc0(sizeof(struct timespec));
cur_time = g_get_real_time();
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;
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;
}
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;
timedate1_complete_set_time(td1_passed_interf, invoc);
return TRUE;
@@
-138,14
+135,12
@@
on_handle_set_time(Timedate1 *td1_passed_interf,
return FALSE;
}
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;
timedate1_complete_set_time(td1_passed_interf, invoc);
return TRUE;