#include <stdlib.h>
#include <assert.h>
#include <unistd.h>
+#include <time.h>
#include <sys/time.h>
#include <sys/types.h>
#include <pwd.h>
#include "putty.h"
-long tickcount_offset = 0;
-
unsigned long getticks(void)
{
- struct timeval tv;
- gettimeofday(&tv, NULL);
/*
- * We want to use milliseconds rather than microseconds,
- * because we need a decent number of them to fit into a 32-bit
- * word so it can be used for keepalives.
+ * We want to use milliseconds rather than the microseconds or
+ * nanoseconds given by the underlying clock functions, because we
+ * need a decent number of them to fit into a 32-bit word so it
+ * can be used for keepalives.
*/
- return tv.tv_sec * 1000 + tv.tv_usec / 1000 + tickcount_offset;
+#if defined HAVE_CLOCK_GETTIME && defined HAVE_DECL_CLOCK_MONOTONIC
+ {
+ /* Use CLOCK_MONOTONIC if available, so as to be unconfused if
+ * the system clock changes. */
+ struct timespec ts;
+ if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
+ return ts.tv_sec * TICKSPERSEC +
+ ts.tv_nsec / (1000000000 / TICKSPERSEC);
+ }
+#endif
+ {
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ return tv.tv_sec * TICKSPERSEC + tv.tv_usec / (1000000 / TICKSPERSEC);
+ }
}
Filename *filename_from_str(const char *str)
int fd;
assert(mode[0] == 'w'); /* is_private is meaningless for read,
and tricky for append */
- fd = open(filename->path, O_WRONLY | O_CREAT | O_TRUNC, 0700);
+ fd = open(filename->path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
if (fd < 0)
return NULL;
return fdopen(fd, mode);