} 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 = mktimespec(proposed_time);
if(!clock_settime(CLOCK_REALTIME, new_time)) {
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 = mktimespec(proposed_time);
if(!clock_settime(CLOCK_REALTIME, new_time)) {
g_printf("%s is not a symlink! attempting to match checksums in %s...\n", OS_LOCALTIME, OS_TIMEZONE_PATH);
hash_to_match = get_file_sha256(OS_LOCALTIME);
- ret = lookup_hash(hash_to_match);
+ /* ret = lookup_hash(hash_to_match); */
+ return FALSE; /* TODO fix me for real */
if(hash_to_match)
g_free(hash_to_match);
set_signal_handlers();
- if(!build_lookup_table())
- return 1;
+ /*if(!build_lookup_table())
+ return 1; */
timedated_loop = g_main_loop_new(NULL, TRUE);
timedated_freeable = g_ptr_array_new();
return ret;
}
-/* TODO need to deconstruct tz_table on exit */
+/* TODO need to deconstruct tz_table on exit
static gboolean build_lookup_table() {
gchar *find_cmd, **map_pairs, *find_output, *path_buf, *sum_buf, **entry_buf;
i++;
return NULL;
+}*/
+
+/* takes number of microseconds since epoch and returns a
+ * ptr to a timespec suitable to be passed to clock_settime(3)
+ */
+static struct timespec* mktimespec(gint64 us) {
+
+ long nanoseconds;
+ time_t seconds;
+
+ gint64 div_buf_remainder, div_buf_s, div_buf_ns;
+ struct timespec *ret;
+
+ div_buf_s = (us / 1000000); /* us / 10^6 = s */
+ div_buf_remainder = (us % 1000000); /* fraction of second lost from prev. line */
+ div_buf_ns = div_buf_remainder * 1000; /* us * 10^3 = ns */
+
+ seconds = (time_t) div_buf_s; /* porting note: most systems use 32 bit time, adjust accordingly */
+ nanoseconds = (long) div_buf_ns;
+
+ ret = (struct timespec *) calloc(1, sizeof(struct timespec));
+
+ ret->tv_sec = seconds;
+ ret->tv_nsec = nanoseconds;
+
+ g_ptr_array_add(timedated_freeable, ret);
+
+ return ret;
}