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 de7567bc461fd8cb8e63c87341360a1c9ea005cf..8318df1c408f9c19fe8b933891f886e044743c93 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -56,12 +56,21 @@
  * [including the GNU Public Licence.]
  */
 
+#include <errno.h>
 #include <stdio.h>
-#include "cryptlib.h"
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.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
@@ -69,9 +78,7 @@
 
 /* #define RFILE ".rand" - defined in ../../e_os.h */
 
-int RAND_load_file(file,bytes)
-const char *file;
-long bytes;
+int RAND_load_file(const char *file, long bytes)
        {
        MS_STATIC unsigned char buf[BUFSIZE];
        struct stat sb;
@@ -82,7 +89,7 @@ long bytes;
 
        i=stat(file,&sb);
        /* If the state fails, put some crap in anyway */
-       RAND_seed((unsigned char *)&sb,sizeof(sb));
+       RAND_seed(&sb,sizeof(sb));
        ret+=sizeof(sb);
        if (i < 0) return(0);
        if (bytes <= 0) return(ret);
@@ -106,15 +113,24 @@ err:
        return(ret);
        }
 
-int RAND_write_file(file)
-const char *file;
+int RAND_write_file(const char *file)
        {
        unsigned char buf[BUFSIZE];
        int i,ret=0;
        FILE *out;
        int n;
 
-       out=fopen(file,"w");
+       /* 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;
@@ -138,9 +154,7 @@ err:
        return(ret);
        }
 
-char *RAND_file_name(buf,size)
-char *buf;
-int size;
+char *RAND_file_name(char *buf, int size)
        {
        char *s;
        char *ret=NULL;
@@ -159,7 +173,9 @@ 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;
                }