first pass

[PuTTY.git] / unix / uxgen.c

diff --git a/unix/uxgen.c b/unix/uxgen.c
index 7bed295c9b5f9f63a6e6c117ad57f94b912a1c51..f593a96064c1365fd794807b99954437bccb80a0 100644 (file)
--- a/unix/uxgen.c
+++ b/unix/uxgen.c
@@ -3,21 +3,27 @@
  */
 
 #include <stdio.h>
+#include <errno.h>
+
 #include <fcntl.h>
 #include <unistd.h>
 
 #include "putty.h"
 
-char *get_random_data(int len)
+char *get_random_data(int len, const char *device)
 {
     char *buf = snewn(len, char);
     int fd;
     int ngot, ret;
 
-    fd = open("/dev/random", O_RDONLY);
+    if (!device)
+        device = "/dev/random";
+
+    fd = open(device, O_RDONLY);
     if (fd < 0) {
        sfree(buf);
-       perror("puttygen: unable to open /dev/random");
+       fprintf(stderr, "puttygen: %s: open: %s\n",
+                device, strerror(errno));
        return NULL;
     }
 
@@ -26,7 +32,9 @@ char *get_random_data(int len)
        ret = read(fd, buf+ngot, len-ngot);
        if (ret < 0) {
            close(fd);
-           perror("puttygen: unable to read /dev/random");
+            sfree(buf);
+            fprintf(stderr, "puttygen: %s: read: %s\n",
+                    device, strerror(errno));
            return NULL;
        }
        ngot += ret;