Commit 9b542d72 authored by Richard Levitte's avatar Richard Levitte
Browse files

VMS: move copy_argc to its own module and make it an aux source 



copy_argv was never initialization code.

Make it self-cleaning too.

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8381)
parent 469ce8ff

Configurations/10-main.conf

+1 −1
Original line number Diff line number Diff line
@@ -1725,7 +1725,7 @@ my %targets = ( 


        disable          => add('pinshared'),



        apps_aux_src     => "vms_term_sock.c",

        apps_aux_src     => "vms_term_sock.c vms_decc_argv.c",

        apps_init_src    => "vms_decc_init.c",

    },

apps/openssl.c

+1 −3
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ int main(int argc, char *argv[]) 
{

    FUNCTION f, *fp;

    LHASH_OF(FUNCTION) *prog = NULL;

    char **copied_argv = NULL;

    char *p, *pname;

    char buf[1024];

    const char *prompt;
@@ -138,7 +137,7 @@ int main(int argc, char *argv[]) 
    bio_err = dup_bio_err(FORMAT_TEXT);



#if defined(OPENSSL_SYS_VMS) && defined(__DECC)

    copied_argv = argv = copy_argv(&argc, argv);

    argv = copy_argv(&argc, argv);

#elif defined(_WIN32)

    /*

     * Replace argv[] with UTF-8 encoded strings.
@@ -252,7 +251,6 @@ int main(int argc, char *argv[]) 
    }

    ret = 1;

 end:

    OPENSSL_free(copied_argv);

    OPENSSL_free(default_config_file);

    lh_FUNCTION_free(prog);

    OPENSSL_free(arg.argv);

apps/vms_decc_argv.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015-2019 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the Apache License 2.0 (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



#include <stdlib.h>

#include <openssl/crypto.h>

#include "apps.h"                /* for app_malloc() and copy_argv() */



char **newargv = NULL;



static void cleanup_argv(void)

{

    OPENSSL_free(newargv);

    newargv = NULL;

}



char **copy_argv(int *argc, char *argv[])

{

    /*-

     * The note below is for historical purpose.  On VMS now we always

     * copy argv "safely."

     *

     * 2011-03-22 SMS.

     * If we have 32-bit pointers everywhere, then we're safe, and

     * we bypass this mess, as on non-VMS systems.

     * Problem 1: Compaq/HP C before V7.3 always used 32-bit

     * pointers for argv[].

     * Fix 1: For a 32-bit argv[], when we're using 64-bit pointers

     * everywhere else, we always allocate and use a 64-bit

     * duplicate of argv[].

     * Problem 2: Compaq/HP C V7.3 (Alpha, IA64) before ECO1 failed

     * to NULL-terminate a 64-bit argv[].  (As this was written, the

     * compiler ECO was available only on IA64.)

     * Fix 2: Unless advised not to (VMS_TRUST_ARGV), we test a

     * 64-bit argv[argc] for NULL, and, if necessary, use a

     * (properly) NULL-terminated (64-bit) duplicate of argv[].

     * The same code is used in either case to duplicate argv[].

     * Some of these decisions could be handled in preprocessing,

     * but the code tends to get even uglier, and the penalty for

     * deciding at compile- or run-time is tiny.

     */



    int i, count = *argc;

    char **p = newargv;



    cleanup_argv();



    newargv = app_malloc(sizeof(*newargv) * (count + 1), "argv copy");

    if (newargv == NULL)

        return NULL;



    /* Register automatic cleanup on first use */

    if (p == NULL)

        OPENSSL_atexit(cleanup_argv);



    for (i = 0; i < count; i++)

        newargv[i] = argv[i];

    newargv[i] = NULL;

    *argc = i;

    return newargv;

}

apps/vms_decc_init.c

+0 −38
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
# include <stdlib.h>

# include <unixlib.h>



# include "apps.h"



/* Global storage. */



/* Flag to sense if decc_init() was called. */
@@ -63,42 +61,6 @@ decc_feat_t decc_feat_array[] = { 
};





char **copy_argv(int *argc, char *argv[])

{

    /*-

     * The note below is for historical purpose.  On VMS now we always

     * copy argv "safely."

     *

     * 2011-03-22 SMS.

     * If we have 32-bit pointers everywhere, then we're safe, and

     * we bypass this mess, as on non-VMS systems.

     * Problem 1: Compaq/HP C before V7.3 always used 32-bit

     * pointers for argv[].

     * Fix 1: For a 32-bit argv[], when we're using 64-bit pointers

     * everywhere else, we always allocate and use a 64-bit

     * duplicate of argv[].

     * Problem 2: Compaq/HP C V7.3 (Alpha, IA64) before ECO1 failed

     * to NULL-terminate a 64-bit argv[].  (As this was written, the

     * compiler ECO was available only on IA64.)

     * Fix 2: Unless advised not to (VMS_TRUST_ARGV), we test a

     * 64-bit argv[argc] for NULL, and, if necessary, use a

     * (properly) NULL-terminated (64-bit) duplicate of argv[].

     * The same code is used in either case to duplicate argv[].

     * Some of these decisions could be handled in preprocessing,

     * but the code tends to get even uglier, and the penalty for

     * deciding at compile- or run-time is tiny.

     */



    int i, count = *argc;

    char **newargv = app_malloc(sizeof(*newargv) * (count + 1), "argv copy");



    for (i = 0; i < count; i++)

        newargv[i] = argv[i];

    newargv[i] = NULL;

    *argc = i;

    return newargv;

}



/* LIB$INITIALIZE initialization function. */



static void decc_init(void)