Synchronise VMS build system with the Unixly one

[openssl.git] / apps / openssl.c

diff --git a/apps/openssl.c b/apps/openssl.c
index 2747b67197a29c7eccdfa62f4781f1ea3c87a4f7..5d61d171cab3be8d4147a382450a7ef6447f240d 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -272,9 +272,21 @@ int main(int Argc, char *Argv[])
        i=NCONF_load(config,p,&errline);
        if (i == 0)
                {
-               NCONF_free(config);
-               config = NULL;
-               ERR_clear_error();
+               if (ERR_GET_REASON(ERR_peek_last_error())
+                   == CONF_R_NO_SUCH_FILE)
+                       {
+                       BIO_printf(bio_err,
+                                  "WARNING: can't open config file: %s\n",p);
+                       ERR_clear_error();
+                       NCONF_free(config);
+                       config = NULL;
+                       }
+               else
+                       {
+                       ERR_print_errors(bio_err);
+                       NCONF_free(config);
+                       exit(1);
+                       }
                }
 
        prog=prog_init();
@@ -595,13 +607,13 @@ static int MS_CALLBACK function_cmp(const FUNCTION *a, const FUNCTION *b)
        {
        return strncmp(a->name,b->name,8);
        }
-static IMPLEMENT_LHASH_COMP_FN(function, FUNCTION);
+static IMPLEMENT_LHASH_COMP_FN(function, FUNCTION)
 
 static unsigned long MS_CALLBACK function_hash(const FUNCTION *a)
        {
        return lh_strhash(a->name);
        }       
-static IMPLEMENT_LHASH_HASH_FN(function, FUNCTION);
+static IMPLEMENT_LHASH_HASH_FN(function, FUNCTION)
 
 static LHASH_OF(FUNCTION) *prog_init(void)
        {
@@ -618,7 +630,7 @@ static LHASH_OF(FUNCTION) *prog_init(void)
                return(NULL);
 
        for (f=functions; f->name != NULL; f++)
-               lh_FUNCTION_insert(ret,f);
+               (void)lh_FUNCTION_insert(ret,f);
        return(ret);
        }