Patch from Robert de Bath to substantially simplify timing.c.

[PuTTY.git] / unix / uxmisc.c

diff --git a/unix/uxmisc.c b/unix/uxmisc.c
index 7d577f96d3e147fdb2f8e8a695101f589b3c9dbb..d11b2f74f5d7a85f1d4826ff7e5965753892bb94 100644 (file)
--- a/unix/uxmisc.c
+++ b/unix/uxmisc.c
@@ -13,8 +13,6 @@
 
 #include "putty.h"
 
-long tickcount_offset = 0;
-
 unsigned long getticks(void)
 {
     struct timeval tv;
@@ -24,7 +22,7 @@ unsigned long getticks(void)
      * 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;
+    return tv.tv_sec * TICKSPERSEC + tv.tv_usec / (1000000 / TICKSPERSEC);
 }
 
 Filename *filename_from_str(const char *str)
@@ -174,7 +172,7 @@ FILE *f_open(const Filename *filename, char const *mode, int is_private)
        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);