Fix `puttygen-unix-perms': f_open(), PuTTY's wrapper on fopen, now

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

diff --git a/unix/uxmisc.c b/unix/uxmisc.c
index c613a20..dc20863 100644 (file)
--- a/unix/uxmisc.c
+++ b/unix/uxmisc.c
@@ -2,8 +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>
@@ -121,3 +123,28 @@ 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 {
+       assert(mode[0] == 'w');        /* is_private is meaningless for read */
+       int fd = open(filename.path, O_WRONLY | O_CREAT | O_TRUNC,
+                     0700);
+       if (fd < 0)
+           return NULL;
+       return fdopen(fd, mode);
+    }
+}