* PuTTY miscellaneous Unix stuff
*/
+#include <fcntl.h>
#include <stdio.h>
+#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"
-/*
- * We want to use milliseconds rather than microseconds or nanoseconds,
- * because we need a decent number of them to fit into a 32-bit
- * word so it can be used for keepalives.
- */
+long tickcount_offset = 0;
+
unsigned long getticks(void)
{
struct timeval tv;
-#ifdef CLOCK_MONOTONIC
- struct timespec ts;
- if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
- return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
-#endif
gettimeofday(&tv, NULL);
- return tv.tv_sec * 1000 + tv.tv_usec / 1000;
+ /*
+ * 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.
+ */
+ return tv.tv_sec * 1000 + tv.tv_usec / 1000 + tickcount_offset;
}
Filename filename_from_str(const char *str)
"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);
+ }
+}