Don't install e_os.h in include/openssl, use it only as a local

[oweals/openssl.git] / crypto / rand / randfile.c

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 1cea7696f963e31f9dd6a3e9ab0b896bc433c9eb..8318df1c408f9c19fe8b933891f886e044743c93 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -56,14 +56,21 @@
  * [including the GNU Public Licence.]
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "e_os.h"
-#include "rand.h"
+
+#ifndef FLAT_INC
+# include "../e_os.h"
+#else
+# include "e_os.h"
+#endif
+
+#include <openssl/rand.h>
 
 #undef BUFSIZE
 #define BUFSIZE        1024
@@ -113,7 +120,17 @@ int RAND_write_file(const char *file)
        FILE *out;
        int n;
 
-       out=fopen(file,"wb");
+       /* Under VMS, fopen(file, "wb") will craete a new version of the
+          same file.  This is not good, so let's try updating an existing
+          one, and create file only if it doesn't already exist.  This
+          should be completely harmless on system that have no file
+          versions.                                    -- Richard Levitte */
+       out=fopen(file,"rb+");
+       if (out == NULL && errno == ENOENT)
+               {
+               errno = 0;
+               out=fopen(file,"wb");
+               }
        if (out == NULL) goto err;
        chmod(file,0600);
        n=RAND_DATA;
@@ -156,7 +173,9 @@ char *RAND_file_name(char *buf, int size)
                if (((int)(strlen(s)+strlen(RFILE)+2)) > size)
                        return(RFILE);
                strcpy(buf,s);
+#ifndef VMS
                strcat(buf,"/");
+#endif
                strcat(buf,RFILE);
                ret=buf;
                }