X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=crypto%2Fdso%2Fdso_vms.c;h=bd284535f1a2c1fd943f948f56fa1094404e1e9c;hb=51c8dc37dd4d655cf44f07d16dc985627a8e3577;hp=58b90273976423e0a2abaa926b0175804b2b4581;hpb=ea4e4149af2faced0a956dcc456b3abe1139c8db;p=openssl.git diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c index 58b9027397..bd284535f1 100644 --- a/crypto/dso/dso_vms.c +++ b/crypto/dso/dso_vms.c @@ -60,6 +60,7 @@ #include #include #ifdef VMS +#pragma message disable DOLLARID #include #include #include @@ -77,7 +78,7 @@ DSO_METHOD *DSO_METHOD_vms(void) #else #pragma message disable DOLLARID -static int vms_load(DSO *dso, const char *filename); +static int vms_load(DSO *dso); static int vms_unload(DSO *dso); static void *vms_bind_var(DSO *dso, const char *symname); static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname); @@ -86,8 +87,9 @@ static int vms_unbind_var(DSO *dso, char *symname, void *symptr); static int vms_unbind_func(DSO *dso, char *symname, DSO_FUNC_TYPE symptr); static int vms_init(DSO *dso); static int vms_finish(DSO *dso); -#endif static long vms_ctrl(DSO *dso, int cmd, long larg, void *parg); +#endif +static char *vms_name_converter(DSO *dso); static DSO_METHOD dso_meth_vms = { "OpenSSL 'VMS' shared library method", @@ -100,7 +102,8 @@ static DSO_METHOD dso_meth_vms = { NULL, /* unbind_var */ NULL, /* unbind_func */ #endif - vms_ctrl, + NULL, /* ctrl */ + vms_name_converter, NULL, /* init */ NULL /* finish */ }; @@ -128,8 +131,9 @@ DSO_METHOD *DSO_METHOD_vms(void) return(&dso_meth_vms); } -static int vms_load(DSO *dso, const char *filename) +static int vms_load(DSO *dso) { +#if 0 DSO_VMS_INTERNAL *p; const char *sp1, *sp2; /* Search result */ @@ -207,6 +211,12 @@ static int vms_load(DSO *dso, const char *filename) return(0); } return(1); +#else + /* See the comments lower down in the vms_name_converter + * "implementation" :-) */ + please_break_compilation(); + return(bother_richard); +#endif } /* Note that this doesn't actually unload the shared image, as there is no @@ -255,13 +265,13 @@ static int do_find_symbol(DSO_VMS_INTERNAL *ptr, 0, flags); } -static void *vms_bind_sym(DSO *dso, const char *symname) +void vms_bind_sym(DSO *dso, const char *symname, void **sym) { DSO_VMS_INTERNAL *ptr; - void *sym = 0; int status; int flags = LIB$M_FIS_MIXEDCASE; struct dsc$descriptor_s symname_dsc; + *sym = NULL; symname_dsc.dsc$w_length = strlen(symname); symname_dsc.dsc$b_dtype = DSC$K_DTYPE_T; @@ -271,24 +281,24 @@ static void *vms_bind_sym(DSO *dso, const char *symname) if((dso == NULL) || (symname == NULL)) { DSOerr(DSO_F_VMS_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER); - return(NULL); + return; } if(sk_num(dso->meth_data) < 1) { DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_STACK_ERROR); - return(NULL); + return; } ptr = (DSO_VMS_INTERNAL *)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1); if(ptr == NULL) { DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_NULL_HANDLE); - return(NULL); + return; } if(dso->flags & DSO_FLAG_UPCASE_SYMBOL) flags = 0; - status = do_find_symbol(ptr, &symname_dsc, &sym, flags); + status = do_find_symbol(ptr, &symname_dsc, sym, flags); if(!$VMS_STATUS_SUCCESS(status)) { @@ -301,6 +311,8 @@ static void *vms_bind_sym(DSO *dso, const char *symname) errstring_dsc.dsc$b_class = DSC$K_CLASS_S; errstring_dsc.dsc$a_pointer = errstring; + *sym = NULL; + status = sys$getmsg(status, &length, &errstring_dsc, 1, 0); if (!$VMS_STATUS_SUCCESS(status)) @@ -322,43 +334,45 @@ static void *vms_bind_sym(DSO *dso, const char *symname) " in ", ptr->filename, ": ", errstring); } - return(NULL); + return; } - return(sym); + return; } static void *vms_bind_var(DSO *dso, const char *symname) { - return vms_bind_sym(dso, symname); + void *sym = 0; + vms_bind_sym(dso, symname, &sym); + return sym; } static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname) { - return (DSO_FUNC_TYPE)vms_bind_sym(dso, symname); + DSO_FUNC_TYPE sym = 0; + vms_bind_sym(dso, symname, (void **)&sym); + return sym; } -static long vms_ctrl(DSO *dso, int cmd, long larg, void *parg) - { - if(dso == NULL) - { - DSOerr(DSO_F_VMS_CTRL,ERR_R_PASSED_NULL_PARAMETER); - return(-1); - } - switch(cmd) - { - case DSO_CTRL_GET_FLAGS: - return dso->flags; - case DSO_CTRL_SET_FLAGS: - dso->flags = (int)larg; - return(0); - case DSO_CTRL_OR_FLAGS: - dso->flags |= (int)larg; - return(0); - default: - break; - } - DSOerr(DSO_F_VMS_CTRL,DSO_R_UNKNOWN_COMMAND); - return(-1); - } +static char *vms_name_converter(DSO *dso) + { + /* Implementation note: on VMS is it preferable to do real conversions + * here, or to actually have it performed in-line with the bind calls + * (given that VMS never actually does a load except implicitly within + * the bind functions). Another note: normally (eg. dlfcn), the + * DSO_load call will either load, put the loaded filename into the DSO + * (which marks it effectively as "read-only"), and return success - or + * it will fail. VMS needs to work out what to do - otherwise DSO_load + * will always succeed, but leave the DSO looking unloaded (because the + * loaded_filename will be NULL still) and then real loading (and + * setting of loaded_filename) will only happen during the first bind + * call (which should have error checking anyway to prevent you calling + * it on an "unloaded" DSO - thus giving VMS *serious* grief). Richard, + * what do you think? Is it worth having DSO_load() try to find and pin + * itself to a library file (and populate loaded_filename) even though + * it's unecessary to actually do a load prior to the first bind call? + * I leave it to you ... :-) */ + deliberately_break_compilation_here(); + return(1); + } #endif /* VMS */