Change the semantics of 'FontSpec' so that it's a dynamically

[u/mdw/putty] / unix / uxmisc.c

diff --git a/unix/uxmisc.c b/unix/uxmisc.c
index 28ae83a..222d559 100644 (file)
--- a/unix/uxmisc.c
+++ b/unix/uxmisc.c
@@ -2,7 +2,10 @@
  * PuTTY miscellaneous Unix stuff
  */
 
+#include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -10,6 +13,8 @@
 
 #include "putty.h"
 
+long tickcount_offset = 0;
+
 unsigned long getticks(void)
 {
     struct timeval tv;
@@ -19,7 +24,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;
+    return tv.tv_sec * 1000 + tv.tv_usec / 1000 + tickcount_offset;
 }
 
 Filename filename_from_str(const char *str)
@@ -118,3 +123,62 @@ void pgp_fingerprints(void)
          "PuTTY Master Key (DSA), 1024-bit:\n"
          "  " PGP_DSA_MASTER_KEY_FP "\n", stdout);
 }
+
+/*
+ * Set FD_CLOEXEC on a file descriptor
+ */
+int cloexec(int fd) {
+    int fdflags;
+
+    fdflags = fcntl(fd, F_GETFD);
+    if (fdflags == -1) return -1;
+    return fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
+}
+
+FILE *f_open(struct Filename filename, char const *mode, int is_private)
+{
+    if (!is_private) {
+       return fopen(filename.path, mode);
+    } else {
+       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);
+       if (fd < 0)
+           return NULL;
+       return fdopen(fd, mode);
+    }
+}
+
+FontSpec *fontspec_new(const char *name)
+{
+    FontSpec *f = snew(FontSpec);
+    f->name = dupstr(name);
+    return f;
+}
+FontSpec *fontspec_copy(const FontSpec *f)
+{
+    return fontspec_new(f->name);
+}
+void fontspec_free(FontSpec *f)
+{
+    sfree(f->name);
+    sfree(f);
+}
+int fontspec_serialise(FontSpec *f, void *data)
+{
+    int len = strlen(f->name);
+    if (data)
+        strcpy(data, f->name);
+    return len + 1;                    /* include trailing NUL */
+}
+FontSpec *fontspec_deserialise(void *vdata, int maxsize, int *used)
+{
+    char *data = (char *)vdata;
+    char *end = memchr(data, '\0', maxsize);
+    if (!end)
+        return NULL;
+    *used = end - data + 1;
+    return fontspec_new(data);
+}