From 99d6296a1daa1f9175ac4da3f84e50647d3a2b99 Mon Sep 17 00:00:00 2001 From: Narayanan Iyer Date: Fri, 26 Jan 2018 15:53:29 -0500 Subject: [PATCH] [#23] Rename all occurrences of libgtmshr.so/libgtmutil.so to libyottadb.so/libyottadbutil.so Also for backward compatibility purposes a) install libgtmshr.so as a soft link to libyottadb.so b) Install libgtmutil.so as a soft link to libyottadbutil.so --- CMakeLists.txt | 62 +++++++++---------- sr_linux/genexport.csh | 6 +- sr_linux/gtm_env_sp.csh | 8 +-- sr_linux/platform.cmake | 12 ++-- sr_port/common_startup_init.c | 4 +- sr_port/dbcertify.c | 4 +- sr_port/gtm_file_stat.h | 42 ++----------- sr_port/gtm_limits.h | 7 ++- sr_port/mdef.h | 6 +- sr_port/merrors.msg | 4 +- sr_port/merrors_ansi.h | 2 +- sr_port/merrors_ctl.c | 2 +- sr_port/mumps.hlp | 12 ++-- sr_unix/badd.txt | 9 ++- sr_unix/buildshr.csh | 35 ++++++----- sr_unix/comlist.csh | 4 +- sr_unix/configure.gtc | 44 ++++++++----- ...dlopen_libgtmshr.c => dlopen_libyottadb.c} | 22 +++---- sr_unix/dse.c | 5 +- sr_unix/ftok.c | 5 +- sr_unix/gtm.c | 4 +- sr_unix/gtm_env.csh | 6 +- sr_unix/gtm_icu.c | 5 +- sr_unix/gtm_permissions.c | 19 +++--- sr_unix/gtm_stdio.c | 5 +- sr_unix/gtm_stdio.h | 5 +- sr_unix/gtm_tls_impl.c | 7 ++- sr_unix/gtmci.c | 9 ++- sr_unix/gtmcrypt_ref.c | 9 ++- sr_unix/gtmcrypt_util.c | 5 +- sr_unix/gtmcrypt_util.h | 5 +- sr_unix/gtmgblstat.xc | 2 +- sr_unix/gtmprofile.gtc | 17 ++--- sr_unix/gtmsecshr.c | 6 +- sr_unix/gtmsecshr_sock_init.c | 9 ++- sr_unix/gtmsource_process.c | 5 +- sr_unix/init_gtm.c | 5 +- sr_unix/kitstart.csh | 10 +-- sr_unix/libyottadb.h | 4 +- sr_unix/lke.c | 4 +- sr_unix/mdefsa.h | 35 +++-------- sr_unix/mupip.c | 4 +- sr_unix/pinentry-gtm.sh | 9 ++- ...{gtmexe_symbols.exp => ydbexe_symbols.exp} | 0 sr_unix/ydbinstall.sh | 2 +- ...gtmshr_symbols.exp => yottadb_symbols.exp} | 0 sr_unix_cm/gtcm_play.c | 4 +- sr_unix_cm/gtcm_server.c | 4 +- sr_unix_cm/gtcm_shmclean.c | 4 +- sr_unix_gnp/gtcm_gnp_server.c | 4 +- 50 files changed, 254 insertions(+), 248 deletions(-) rename sr_unix/{dlopen_libgtmshr.c => dlopen_libyottadb.c} (75%) rename sr_unix/{gtmexe_symbols.exp => ydbexe_symbols.exp} (100%) rename sr_unix/{gtmshr_symbols.exp => yottadb_symbols.exp} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6a49daee..67e2f239e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,27 +197,27 @@ endmacro() # Assign sources to executables. set_source_list(gtm_threadgbl_deftypes gtm_threadgbl_deftypes) -set_source_list(dbcertify dbcertify dlopen_libgtmshr) -set_source_list(dse dse dlopen_libgtmshr) -set_source_list(ftok ftok dlopen_libgtmshr) +set_source_list(dbcertify dbcertify dlopen_libyottadb) +set_source_list(dse dse dlopen_libyottadb) +set_source_list(ftok ftok dlopen_libyottadb) set_source_list(geteuid geteuid) -set_source_list(gtcm_gnp_server gtcm_gnp_server dlopen_libgtmshr) +set_source_list(gtcm_gnp_server gtcm_gnp_server dlopen_libyottadb) set_source_list(gtcm_pkdisp gtcm_pkdisp omi_extstr) -set_source_list(gtcm_play gtcm_play dlopen_libgtmshr) -set_source_list(gtcm_server gtcm_server dlopen_libgtmshr) -set_source_list(gtcm_shmclean gtcm_shmclean dlopen_libgtmshr) +set_source_list(gtcm_play gtcm_play dlopen_libyottadb) +set_source_list(gtcm_server gtcm_server dlopen_libyottadb) +set_source_list(gtcm_shmclean gtcm_shmclean dlopen_libyottadb) set_source_list(gtmsecshr gtmsecshr_wrapper) set_source_list(gtmsecshr_real gtmsecshr) set_source_list(libgtmcrypt gtmcrypt_ref gtmcrypt_pk_ref gtmcrypt_dbk_ref gtmcrypt_sym_ref gtmcrypt_util) set_source_list(libgtmtls gtm_tls_impl gtmcrypt_util) -set_source_list(libgtmshr gtm_main mupip_main mupip_cmd dse_main dse_cmd lke_main lke_cmd) -set_source_list(libgtmshr gtcm_play_main omi_srvc_xct omi_extstr) -set_source_list(libgtmshr gtcm_server_main gtcm_gnp_server_main gtcm_gnp_clitab gtcm_shmclean_main) -set_source_list(libgtmshr dbcertify_main dbcertify_cmd ftok_main) -set_source_list(lke lke dlopen_libgtmshr) +set_source_list(libyottadb gtm_main mupip_main mupip_cmd dse_main dse_cmd lke_main lke_cmd) +set_source_list(libyottadb gtcm_play_main omi_srvc_xct omi_extstr) +set_source_list(libyottadb gtcm_server_main gtcm_gnp_server_main gtcm_gnp_clitab gtcm_shmclean_main) +set_source_list(libyottadb dbcertify_main dbcertify_cmd ftok_main) +set_source_list(lke lke dlopen_libyottadb) set_source_list(maskpass maskpass gtmcrypt_util) -set_source_list(mumps gtm dlopen_libgtmshr) -set_source_list(mupip mupip dlopen_libgtmshr) +set_source_list(mumps gtm dlopen_libyottadb) +set_source_list(mupip mupip dlopen_libyottadb) set_source_list(semstat2 semstat2) #----------------------------------------------------------------------------- @@ -358,9 +358,9 @@ add_custom_command( add_custom_target(gen_gtm_threadgbl_deftypes DEPENDS ${YDB_BINARY_DIR}/${gtmthreadgblasmhdr} ${YDB_BINARY_DIR}/${gtmthreadgblasmfile}) -foreach(exp exe shr) - set(out gtm${exp}_symbols.export) - set(in ${YDB_SOURCE_DIR}/sr_unix/gtm${exp}_symbols.exp) +foreach(exp ydbexe yottadb) + set(out ${exp}_symbols.export) + set(in ${YDB_SOURCE_DIR}/sr_unix/${exp}_symbols.exp) add_custom_command( OUTPUT ${out} DEPENDS ${in} gen_gtm_threadgbl_deftypes @@ -368,7 +368,7 @@ foreach(exp exe shr) ) endforeach() -add_custom_target(gen_export DEPENDS gtmexe_symbols.export gtmshr_symbols.export) +add_custom_target(gen_export DEPENDS ydbexe_symbols.export yottadb_symbols.export) foreach(lib mumps @@ -389,9 +389,9 @@ endif() function(add_executable target) _add_executable(${target} ${ARGN}) set_target_properties(${target} PROPERTIES LINK_FLAGS "-Wl,-Map=${target}.map") - # Since all utilities now dlopen() libgtmshr.so at startup, add a dependency to not build the utilities - # until libgtmshr.so was built. And that in turn relies on threadgbl_deftypes being built so add that too. - add_dependencies(${target} libgtmshr gen_gtm_threadgbl_deftypes) + # Since all utilities now dlopen() libyottadb.so at startup, add a dependency to not build the utilities + # until libyottadb.so was built. And that in turn relies on threadgbl_deftypes being built so add that too. + add_dependencies(${target} libyottadb gen_gtm_threadgbl_deftypes) # And add system libraries as a target library for all utilities (e.g. dlopen() etc.). target_link_libraries(${target} ${libsyslibs}) endfunction() @@ -413,7 +413,7 @@ set_target_properties(gtmsecshr_real PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${YDB_BINARY_DIR}/gtmsecshrdir ) target_link_libraries(gtmsecshr_real libmumps) # needed for static linking since this is a setuid executable - # and does not do a dlopen of libgtmshr.so + # and does not do a dlopen of libyottadb.so add_executable(mupip ${mupip_SOURCES}) list(APPEND with_export mupip) @@ -439,15 +439,15 @@ add_executable(semstat2 ${semstat2_SOURCES}) add_executable(ftok ${ftok_SOURCES}) -add_library(libgtmshr MODULE ${libgtmshr_SOURCES}) -set_property(TARGET libgtmshr PROPERTY OUTPUT_NAME gtmshr) -target_link_libraries(libgtmshr libmumps) -set_target_properties(libgtmshr PROPERTIES - LINK_FLAGS "${libgtmshr_link} -Wl,-Map=libgtmshr.map" - LINK_DEPENDS "${libgtmshr_dep}" +add_library(libyottadb MODULE ${libyottadb_SOURCES}) +set_property(TARGET libyottadb PROPERTY OUTPUT_NAME yottadb) +target_link_libraries(libyottadb libmumps) +set_target_properties(libyottadb PROPERTIES + LINK_FLAGS "${libyottadb_link} -Wl,-Map=libyottadb.map" + LINK_DEPENDS "${libyottadb_dep}" ) -add_dependencies(libgtmshr gen_export) -add_dependencies(mumps libgtmshr) +add_dependencies(libyottadb gen_export) +add_dependencies(mumps libyottadb) # Iterate over the list of GPG related libraries foreach(gpglib gpg-error gpgme gcrypt config) @@ -579,7 +579,7 @@ install(TARGETS ftok gtmsecshr mupip - libgtmshr + libyottadb DESTINATION ${YDB_INSTALL_DIR} ) install(TARGETS gtmsecshr_real DESTINATION ${YDB_INSTALL_DIR}/gtmsecshrdir) diff --git a/sr_linux/genexport.csh b/sr_linux/genexport.csh index 041370f83..822c25439 100755 --- a/sr_linux/genexport.csh +++ b/sr_linux/genexport.csh @@ -2,7 +2,7 @@ # # # Copyright 2001, 2010 Fidelity Information Services, Inc # # # -# Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. # +# Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries. # # All rights reserved. # # # # This source code contains the intellectual property # @@ -15,10 +15,10 @@ ############################################################################################ # # genexport.csh - to generate the linker script *.export to export -# all call-in related symbols from libgtmshr.so +# all call-in related symbols from libyottadb.so # Argument # $1 - The pathname of a .exp file that list out all symbols to be exposed -# $2 - output verstion script file to be specified with ld --version-script. +# $2 - output version script file to be specified with ld --version-script. # # Example output: # { diff --git a/sr_linux/gtm_env_sp.csh b/sr_linux/gtm_env_sp.csh index 03c3c4645..b890c2bbe 100755 --- a/sr_linux/gtm_env_sp.csh +++ b/sr_linux/gtm_env_sp.csh @@ -253,10 +253,10 @@ if ( $?gtm_version_change == "1" ) then # -M generate link map onto standard output setenv gt_ld_options_common "-Wl,-M" - setenv gt_ld_options_gtmshr "-Wl,-u,accumulate -Wl,-u,is_big_endian -Wl,-u,to_ulong" - setenv gt_ld_options_gtmshr "$gt_ld_options_gtmshr -Wl,-u,gtm_filename_to_id -Wl,--version-script,gtmshr_symbols.export" + setenv gt_ld_options_yottadb "-Wl,-u,accumulate -Wl,-u,is_big_endian -Wl,-u,to_ulong" + setenv gt_ld_options_yottadb "$gt_ld_options_yottadb -Wl,-u,gtm_filename_to_id -Wl,--version-script,yottadb_symbols.export" setenv gt_ld_options_all_exe "-rdynamic -Wl,-u,gtm_filename_to_id -Wl,-u,gtm_zstatus" - setenv gt_ld_options_all_exe "$gt_ld_options_all_exe -Wl,--version-script,gtmexe_symbols.export" + setenv gt_ld_options_all_exe "$gt_ld_options_all_exe -Wl,--version-script,ydbexe_symbols.export" # optimize for all 64bit platforms # @@ -288,7 +288,7 @@ if ( $?gtm_version_change == "1" ) then # over-ride option. if ( "x86_64" == $mach_type && "32" == $gt_build_type ) then setenv gt_cc_options_common "$gt_cc_options_common -m32" - setenv gt_ld_options_gtmshr "$gt_ld_options_gtmshr -m32" + setenv gt_ld_options_yottadb "$gt_ld_options_yottadb -m32" setenv gt_cc_shl_options "$gt_cc_shl_options -m32" setenv gt_ld_shl_options "$gt_ld_shl_options -m32" setenv gt_ld_options_common "$gt_ld_options_common -m32" diff --git a/sr_linux/platform.cmake b/sr_linux/platform.cmake index ac51b735d..cf1935a5a 100644 --- a/sr_linux/platform.cmake +++ b/sr_linux/platform.cmake @@ -124,13 +124,13 @@ add_definitions( ) # Linker -set(gtm_link "-Wl,-u,gtm_filename_to_id -Wl,-u,ydb_zstatus -Wl,--version-script,\"${YDB_BINARY_DIR}/gtmexe_symbols.export\"") -set(gtm_dep "${YDB_BINARY_DIR}/gtmexe_symbols.export") +set(gtm_link "-Wl,-u,gtm_filename_to_id -Wl,-u,ydb_zstatus -Wl,--version-script,\"${YDB_BINARY_DIR}/ydbexe_symbols.export\"") +set(gtm_dep "${YDB_BINARY_DIR}/ydbexe_symbols.export") -set(libgtmshr_link "-Wl,-u,ydb_ci -Wl,-u,gtm_filename_to_id -Wl,-u,gtm_is_main_thread") -set(libgtmshr_link "${libgtmshr_link} -Wl,-u,accumulate -Wl,-u,is_big_endian -Wl,-u,to_ulong") -set(libgtmshr_link "${libgtmshr_link} -Wl,--version-script,\"${YDB_BINARY_DIR}/gtmshr_symbols.export\"") -set(libgtmshr_dep "${YDB_BINARY_DIR}/gtmexe_symbols.export") +set(libyottadb_link "-Wl,-u,ydb_ci -Wl,-u,gtm_filename_to_id -Wl,-u,gtm_is_main_thread") +set(libyottadb_link "${libyottadb_link} -Wl,-u,accumulate -Wl,-u,is_big_endian -Wl,-u,to_ulong") +set(libyottadb_link "${libyottadb_link} -Wl,--version-script,\"${YDB_BINARY_DIR}/yottadb_symbols.export\"") +set(libyottadb_dep "${YDB_BINARY_DIR}/ydbexe_symbols.export") if(${bits} EQUAL 32) if("${arch}" MATCHES "armv[67]l") diff --git a/sr_port/common_startup_init.c b/sr_port/common_startup_init.c index fcad6369d..d2a7f67cf 100644 --- a/sr_port/common_startup_init.c +++ b/sr_port/common_startup_init.c @@ -3,7 +3,7 @@ * Copyright (c) 2014-2017 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -52,7 +52,7 @@ void common_startup_init(enum gtmImageTypes img_type, CLI_ENTRY *image_cmd_ary) SETUP_THREADGBL_ACCESS; if (image_type) { /* An image is already loaded. This is possible if a C function that did call-ins - * (and hence has access to the symbols that libgtmshr.so exposes) invokes "dlopen_libgtmshr" + * (and hence has access to the symbols that libyottadb.so exposes) invokes "dlopen_libyottadb" * more than once for different image types. Do not allow multiple images to be loaded. */ rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MIXIMAGE, 4, GTMIMAGENAMETXT(img_type), GTMIMAGENAMETXT(image_type)); diff --git a/sr_port/dbcertify.c b/sr_port/dbcertify.c index fcf3e80f7..61d687d08 100644 --- a/sr_port/dbcertify.c +++ b/sr_port/dbcertify.c @@ -1,6 +1,6 @@ /**************************************************************** * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -16,5 +16,5 @@ int main(int argc, char **argv, char **envp) { - return dlopen_libgtmshr(argc, argv, envp, "dbcertify_main"); + return dlopen_libyottadb(argc, argv, envp, "dbcertify_main"); } diff --git a/sr_port/gtm_file_stat.h b/sr_port/gtm_file_stat.h index 097a0acbe..8c880421f 100755 --- a/sr_port/gtm_file_stat.h +++ b/sr_port/gtm_file_stat.h @@ -1,6 +1,9 @@ /**************************************************************** * * - * Copyright 2001, 2002 Sanchez Computer Associates, Inc. * + * Copyright 2001, 2002 Sanchez Computer Associates, Inc. * + * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * @@ -18,43 +21,6 @@ #define FILE_READONLY 2 #define FILE_STAT_ERROR 4 -/* Copy the filename from "src" to "dest" using the following rules. - * (i) removing the version information - * (ii) doing compression of contiguous directory delimiters (']' or '>' followed by '<' or '['). - * (iii) transform every '<' to a '[' and every '>' to a ']' - * e.g. - * src = user:[library.]gtmshr.exe;23 - * dst = user:[library.v990.pro]gtmshr.exe - * - * Note that without (iii) we would have got the following mixed notation for "dst" which is incorrect - * as the '[' is balanced by a '>' (at the end of ".pro>") instead of a corresponding ']'. - * - * e.g. src = user:[library.]gtmshr.exe;23 - * dst = user:[library.v990.pro>gtmshr.exe */ -#ifdef VMS -#define fncpy_nover(src, src_len, dest, dest_len) \ -{ \ - unsigned char *sptr, *dptr; \ - for (sptr = (unsigned char *)src, dptr = dest; sptr < (src + src_len) && (';' != *sptr); ) \ - { \ - if (('>' == *sptr || ']' == *sptr) && ('<' == *(sptr + 1) || '[' == *(sptr + 1))) \ - sptr += 2; \ - else if ('<' == *sptr) \ - { \ - *dptr++ = '['; \ - sptr++; \ - } else if ('>' == *sptr) \ - { \ - *dptr++ = ']'; \ - sptr++; \ - } else \ - *dptr++ = *sptr++; \ - } \ - dest_len = dptr - (unsigned char *)(dest); \ - *(dptr) = 0; \ -} -#endif - int gtm_file_stat(mstr *file, mstr *def, mstr *ret, boolean_t check_prv, uint4 *status); #endif /* GTM_FILE_STAT_INCLUDED */ diff --git a/sr_port/gtm_limits.h b/sr_port/gtm_limits.h index cb50da535..4bbe2a338 100755 --- a/sr_port/gtm_limits.h +++ b/sr_port/gtm_limits.h @@ -1,6 +1,9 @@ /**************************************************************** * * - * Copyright 2002, 2014 Fidelity Information Services, Inc * + * Copyright 2002, 2014 Fidelity Information Services, Inc * + * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * @@ -41,7 +44,7 @@ /* Now define our version which includes space for a terminating NULL byte */ #define GTM_PATH_MAX PATH_MAX + 1 /* The maximum path to the GT.M distribution is complicated by the paths underneath $gtm_dist. - * At the top level, there is libgtmshr.{so,sl,dll} which is roughly 12 characters plus 1 for the + * At the top level, there is libyottadb.so which is roughly 12 characters plus 1 for the * slash. The path length of gtmsecshrdir/gtmsecshr doesn't come into play because * $gtm_dist/gtmsecshr will change directory to $gtm_dist/gtmsecshrdir (13 characters including the * leading slash) and then exec gtmsecshr, avoiding the maximum path issue. Going to "UTF-8" mode adds diff --git a/sr_port/mdef.h b/sr_port/mdef.h index e538b4977..cb912f28c 100644 --- a/sr_port/mdef.h +++ b/sr_port/mdef.h @@ -1390,7 +1390,7 @@ void suspend(int sig); mval *push_mval(mval *arg1); void mval_lex(mval *v, mstr *output); -int dlopen_libgtmshr(int argc, char **argv, char **envp, char *main_func); +int dlopen_libyottadb(int argc, char **argv, char **envp, char *main_func); int gtm_main(int argc, char **argv, char **envp); int mupip_main(int argc, char **argv, char **envp); int dse_main(int argc, char **argv, char **envp); @@ -1913,10 +1913,10 @@ enum #endif #ifdef DEBUG - /* Define macros that are helpful in verifying that functions in libgtmshr.so are only invoked + /* Define macros that are helpful in verifying that functions in libyottadb.so are only invoked * by the executables/utilities we expect and not by anything else. For example, libgnpclient.list * used to have a list of modules that this library includes and was linked only by mumps and lke. - * Now libgnpclient.list is nixed (as part of changes that made all utilities use libgtmshr.so + * Now libgnpclient.list is nixed (as part of changes that made all utilities use libyottadb.so * and reduce their sizes) but we now have an ASSERT_IS_LIBGNPCLIENT check at function entry in all * functions that were part of modules in that listing file. Same with the other asserts defined below. */ diff --git a/sr_port/merrors.msg b/sr_port/merrors.msg index 14cc49a72..1c243e951 100644 --- a/sr_port/merrors.msg +++ b/sr_port/merrors.msg @@ -143,8 +143,8 @@ ! usages should be reflected with the new value. ! ERR_GTMDISTUNDEF 150377714 (reported in gtm.c if $gtm_dist is not defined) ! ERR_DISTPATHMAX 150377682 (reported in gtm.c if $gtm_dist buffer is insufficient) -! ERR_DLLNOOPEN 150379250 (reported in gtm.c if libgtmshr cannot be opened) -! ERR_DLLNORTN 150379258 (reported in gtm.c if gtm_main is not found in libgtmshr) +! ERR_DLLNOOPEN 150379250 (reported in gtm.c if libyottadb cannot be opened) +! ERR_DLLNORTN 150379258 (reported in gtm.c if gtm_main is not found in libyottadb) ! ERR_OPCOMMISSED 150381275 (sent via $SNDOPR in util_output.c if prior errors) ! ! The following items must be followed by a tab (because they are parsed by tools/library/doc_tools/routines/diffm.m) diff --git a/sr_port/merrors_ansi.h b/sr_port/merrors_ansi.h index bef90555a..8e9aa13b2 100644 --- a/sr_port/merrors_ansi.h +++ b/sr_port/merrors_ansi.h @@ -1,6 +1,6 @@ /**************************************************************** * * - * Copyright (c) 2001-2018 Fidelity National Information * + * Copyright (c) 2001-2018 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* diff --git a/sr_port/merrors_ctl.c b/sr_port/merrors_ctl.c index 54c370645..0a196581e 100644 --- a/sr_port/merrors_ctl.c +++ b/sr_port/merrors_ctl.c @@ -1,6 +1,6 @@ /**************************************************************** * * - * Copyright (c) 2001-2018 Fidelity National Information * + * Copyright (c) 2001-2018 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* diff --git a/sr_port/mumps.hlp b/sr_port/mumps.hlp index 4a5aa7981..4ce1c8a01 100755 --- a/sr_port/mumps.hlp +++ b/sr_port/mumps.hlp @@ -18403,7 +18403,7 @@ invocation. libyottadb.h also includes definitions for the following entry points - exported from libgtmshr: + exported from libyottadb: void gtm_hiber_start(ydb_uint_t mssleep); void gtm_hiber_start_wait_any(ydb_uint_t mssleep) @@ -18934,7 +18934,7 @@ To facilitate Call-Ins to M routines, the YottaDB distribution directory ($gtm_dist) contains the following files: - 1. libgtmshr.so - A shared library that implements the YottaDB run-time + 1. libyottadb.so - A shared library that implements the YottaDB run-time system, including the Call-In API. If Call-Ins are used from a standalone C/C++ program, this library needs to be explicitly linked into the program. @@ -18945,7 +18945,7 @@ platforms. 2. mumps - The YottaDB startup program that dynamically links with - libgtmshr.so. + libyottadb.so. 3. gtmxc_types.h - A C-header file containing the declarations of Call-In API. @@ -19014,7 +19014,7 @@ that require more than 18 digits as strings. libyottadb.h also includes definitions for the following entry points - exported from libgtmshr: + exported from libyottadb: void gtm_hiber_start(ydb_uint_t mssleep); void gtm_hiber_start_wait_any(ydb_uint_t mssleep) @@ -19280,10 +19280,10 @@ be used instead of the native types (int, float, char, etc). To use call-ins from a standalone C program, it is necessary that the YottaDB - runtime library (libgtmshr.so) is explicitly linked into the program. If + runtime library (libyottadb.so) is explicitly linked into the program. If call-ins are used from an External Call function (which in turn was called from YottaDB through the existing external call mechanism), the External Call - library does not need to be linked explicitly with libgtmshr.so since YottaDB + library does not need to be linked explicitly with libyottadb.so since YottaDB would have already loaded it. 3 Nested_Call-Ins diff --git a/sr_unix/badd.txt b/sr_unix/badd.txt index 49eb4a1c0..f5fa325a5 100644 --- a/sr_unix/badd.txt +++ b/sr_unix/badd.txt @@ -1,6 +1,9 @@ ################################################################# # # -# Copyright 2011, 2013 Fidelity Information Services, Inc # +# Copyright 2011, 2013 Fidelity Information Services, Inc # +# # +# Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. # +# All rights reserved. # # # # This source code contains the intellectual property # # of its copyright holder(s), and is made available # @@ -18,7 +21,7 @@ gtmcshrc.gtc%-r-xr-x--- gtmbase gtmhelp.dat%-r-xr-x--- gtmcshrc gtmsecshr%-r-xr-x--- gtmprofile gtmsecshr%-r-xr-x--- gtmprofile_preV54000 -lke%-r-xr-x--- libgtmutil.so +lke%-r-xr-x--- libyottadbutil.so pro/plugin: zzz_insert%dr-xr-x--- o @@ -32,7 +35,7 @@ TTTGEN.m -> ../TTTGEN.m%lrwxrwxrwx README.txt -> ../README.txt dse -> ../dse%lrwxrwxrwx custom_errors_sample.txt -> ../custom_errors_sample.txt gtmstart.gtc -> ../gtmstart.gtc%-r-sr-x--- gtmsecshr gtmstart.gtc -> ../gtmstart.gtc%dr-x------ gtmsecshrdir -lke -> ../lke%-r-xr-x--- libgtmutil.so +lke -> ../lke%-r-xr-x--- libyottadbutil.so pro/utf8/gtmsecshrdir: zzz_insert%-r-s------ gtmsecshr diff --git a/sr_unix/buildshr.csh b/sr_unix/buildshr.csh index 8c2c47579..242c0cc2e 100755 --- a/sr_unix/buildshr.csh +++ b/sr_unix/buildshr.csh @@ -4,6 +4,9 @@ # Copyright (c) 2001-2015 Fidelity National Information # # Services, Inc. and/or its subsidiaries. All rights reserved. # # # +# Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. # +# All rights reserved. # +# # # This source code contains the intellectual property # # of its copyright holder(s), and is made available # # under a license. If you do not know the terms of # @@ -76,10 +79,10 @@ if ( $buildshr_status != 0 ) then endif set gt_ld_linklib_options = "-L$gtm_obj $gtm_obj/gtm_main.o -lmumps -lgnpclient -lcmisockettcp" -set nolibgtmshr = "no" # by default build libgtmshr +set nolibyottadb = "no" # by default build libyottadb if ($gt_image == "bta") then - set nolibgtmshr = "yes" # if bta build, build a static mumps executable + set nolibyottadb = "yes" # if bta build, build a static mumps executable endif if ("OS/390" == $HOSTOS) then @@ -87,46 +90,46 @@ if ("OS/390" == $HOSTOS) then else set exp = "export" endif -$shell $gtm_tools/genexport.csh $gtm_tools/gtmshr_symbols.exp gtmshr_symbols.$exp +$shell $gtm_tools/genexport.csh $gtm_tools/yottadb_symbols.exp yottadb_symbols.$exp # The below is used to generate an export file that is specific to executables. Typically used to export # some symbols from utility progs like mupip, dse, lke etc -$shell $gtm_tools/genexport.csh $gtm_tools/gtmexe_symbols.exp gtmexe_symbols.$exp +$shell $gtm_tools/genexport.csh $gtm_tools/ydbexe_symbols.exp ydbexe_symbols.$exp -if ($nolibgtmshr == "no") then # do not build libgtmshr.so for bta builds - # Building libgtmshr.so shared library +if ($nolibyottadb == "no") then # do not build libyottadb.so for bta builds + # Building libyottadb.so shared library set aix_loadmap_option = '' set aix_binitfini_option = '' if ( $HOSTOS == "AIX") then set aix_loadmap_option = \ - "-bcalls:$gtm_map/libgtmshr.loadmap -bmap:$gtm_map/libgtmshr.loadmap -bxref:$gtm_map/libgtmshr.loadmap" - # Delete old gtmshr since AIX linker fails to overwrite an already loaded shared library. - rm -f $3/libgtmshr$gt_ld_shl_suffix - # Define gtmci_cleanup as a termination routine for libgtmshr on AIX. + "-bcalls:$gtm_map/libyottadb.loadmap -bmap:$gtm_map/libyottadb.loadmap -bxref:$gtm_map/libyottadb.loadmap" + # Delete old yottadb since AIX linker fails to overwrite an already loaded shared library. + rm -f $3/libyottadb$gt_ld_shl_suffix + # Define gtmci_cleanup as a termination routine for libyottadb on AIX. set aix_binitfini_option = "-binitfini::gtmci_cleanup" endif set echo gt_ld $gt_ld_options $gt_ld_shl_options $aix_binitfini_option $gt_ld_ci_options $aix_loadmap_option \ - ${gt_ld_option_output}$3/libgtmshr$gt_ld_shl_suffix \ - ${gt_ld_linklib_options} $gt_ld_extra_libs $gt_ld_syslibs >& $gtm_map/libgtmshr.map + ${gt_ld_option_output}$3/libyottadb$gt_ld_shl_suffix \ + ${gt_ld_linklib_options} $gt_ld_extra_libs $gt_ld_syslibs >& $gtm_map/libyottadb.map @ exit_status = $status unset echo if ( $exit_status != 0 ) then @ buildshr_status++ - echo "buildshr-E-linkgtmshr, Failed to link gtmshr (see ${dollar_sign}gtm_map/libgtmshr.map)" \ + echo "buildshr-E-linkyottadb, Failed to link yottadb (see ${dollar_sign}gtm_map/libyottadb.map)" \ >> $gtm_log/error.`basename $gtm_exe`.log else if ( ($HOSTOS == "Linux") && (-e /usr/bin/chcon) ) then # Successful build -- for Linux builds use chcon to enable usage of executable (later SELinux platforms) # Note that this command only works on filesystems that support context info so because it may fail, # (and if it does, it is irrelevent) we merrily ignore the output. It either works or it doesn't. - chcon -t texrel_shlib_t $3/libgtmshr$gt_ld_shl_suffix >& /dev/null + chcon -t texrel_shlib_t $3/libyottadb$gt_ld_shl_suffix >& /dev/null endif if ($HOSTOS == "OS/390") then - cp $gtm_obj/gtmshr_symbols.$exp $3/ + cp $gtm_obj/yottadb_symbols.$exp $3/ endif - set gt_ld_linklib_options = "-L$gtm_obj" # do not link in mumps whatever is already linked in libgtmshr.so + set gt_ld_linklib_options = "-L$gtm_obj" # do not link in mumps whatever is already linked in libyottadb.so endif # Building mumps executable diff --git a/sr_unix/comlist.csh b/sr_unix/comlist.csh index f9e949553..f0091873a 100755 --- a/sr_unix/comlist.csh +++ b/sr_unix/comlist.csh @@ -3,7 +3,7 @@ # Copyright (c) 2001-2017 Fidelity National Information # # Services, Inc. and/or its subsidiaries. All rights reserved. # # # -# Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. # +# Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries. # # All rights reserved. # # # # This source code contains the intellectual property # @@ -651,7 +651,7 @@ if ( ! -x $gtm_dist/mumps ) then endif set mupip_size = `ls -l $gtm_exe/mupip |awk '{print $5}'` -set gtmshr_size = `ls -l $gtm_exe/libgtmshr$gt_ld_shl_suffix |awk '{print $5}'` +set yottadb_size = `ls -l $gtm_exe/libyottadb$gt_ld_shl_suffix |awk '{print $5}'` cd $p3 diff --git a/sr_unix/configure.gtc b/sr_unix/configure.gtc index 075287ba3..60acd7f9a 100755 --- a/sr_unix/configure.gtc +++ b/sr_unix/configure.gtc @@ -4,7 +4,7 @@ # Copyright (c) 2009-2017 Fidelity National Information # # Services, Inc. and/or its subsidiaries. All rights reserved. # # # -# Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. # +# Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries. # # All rights reserved. # # # # Copyright (c) 2017 Stephen L Johnson. All rights reserved. # @@ -73,7 +73,7 @@ else echo "Shared libary ldflags not set for this platform"; exit 1 fi # Binaries -binaries="mupip mumps libgtmshr$ext lke dse geteuid ftok semstat2" +binaries="mupip mumps libyottadb$ext lke dse geteuid ftok semstat2" # Normal scripts - executed by anyone nscripts="gtmbase lowerc_cp" @@ -112,7 +112,7 @@ fi $echo " YottaDB Configuration Script" $echo "Copyright 2009, 2014 Fidelity Information Services, Inc. Use of this" $echo "software is restricted by the provisions of your license agreement." -$echo "Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries." +$echo "Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries." $echo "All rights reserved." $echo "" @@ -448,6 +448,12 @@ if [ "$doutf8" -ne 0 ]; then fi fi +# Install libgtmshr.so as a soft link to libyottadb.so for backward compatibility purposes just in case +ln -s ./libyottadb$ext $gtmdist/libgtmshr$ext || echo ln -s ./libyottadb$ext $gtmdist/libgtmshr$ext +if [ "$doutf8" -ne 0 ]; then + ln -s ./libyottadb$ext $gtmdist/utf8/libgtmshr$ext || echo ln -s ./libyottadb$ext $gtmdist/utf8/libgtmshr$ext +fi + # Install COPYING as well as README.md (YottaDB) or README.txt (GT.M) if it is applicable for file in COPYING README.md README.txt do @@ -524,11 +530,11 @@ do chown $owner $gtmdist/$i done -# For linux systems, attempt to execute the chcon command to allow use of the libgtmshr shared library. This +# For linux systems, attempt to execute the chcon command to allow use of the libyottadb shared library. This # command is required on many modern SELinux based systems but depends on the filesystem in use (requires context # support). For that reason, we attempt the command and if it works, great. If it doesn't, oh well we tried. if [ -f /usr/bin/chcon ]; then - (chcon -t texrel_shlib_t $gtmdist/libgtmshr$ext; exit 0) + (chcon -t texrel_shlib_t $gtmdist/libyottadb$ext; exit 0) fi # Create $gtmdist/plugin/gtmcrypt directory if this platform supports encryption @@ -657,8 +663,8 @@ if [ "$resp" = "Y" -o "$resp" = "y" ] ; then fi fi -# Change mode to executable for mumps and libgtmshr to do the compiles -chmod 755 $gtmdist/mumps $gtmdist/libgtmshr$ext +# Change mode to executable for mumps and libyottadb to do the compiles +chmod 755 $gtmdist/mumps $gtmdist/libyottadb$ext gtmroutines=$gtmdist gtmgbldir=$gtmdist/mumps.gld @@ -674,7 +680,7 @@ $echo "" # Ensure we are NOT in UTF-8 mode gtm_chset="M" export gtm_chset -(cd $gtmdist; ./mumps -noignore *.m; $echo $?>compstat ; $ldcmd $ldflags -o libgtmutil$ext *.o ) +(cd $gtmdist; ./mumps -noignore *.m; $echo $?>compstat ; $ldcmd $ldflags -o libyottadbutil$ext *.o ) # Now work on UTF-8 mode if [ "$doutf8" -ne 0 ]; then @@ -698,10 +704,16 @@ if [ "$doutf8" -ne 0 ]; then export LD_LIBRARY_PATH fi (gtm_dist=$gtmdist/utf8; export gtm_dist; cd $gtm_dist; ./mumps -noignore *.m; $echo $?>>$gtmdist/compstat; \ - if [ $is64bit_gtm -eq 1 -o "linux" != $arch ] ; then $ldcmd $ldflags -o libgtmutil$ext *.o ; fi ) + if [ $is64bit_gtm -eq 1 -o "linux" != $arch ] ; then $ldcmd $ldflags -o libyottadbutil$ext *.o ; fi ) ) fi +# Install libgtmutil.so as a soft link to libyottadbutil.so for backward compatibility purposes just in case +ln -s ./libyottadbutil$ext $gtmdist/libgtmutil$ext || echo ln -s ./libyottadbutil$ext $gtmdist/libgtmutil$ext +if [ "$doutf8" -ne 0 ]; then + ln -s ./libyottadbutil$ext $gtmdist/utf8/libgtmutil$ext || echo ln -s ./libyottadbutil$ext $gtmdist/utf8/libgtmutil$ext +fi + # Change mode to executable for the normal binaries for i in $binaries do @@ -729,8 +741,8 @@ if [ "$doutf8" -ne 0 ]; then chgrp $bingroup $gtmdist/utf8/*.txt fi -if [ -f $gtm_dist/libgtmutil$ext ] ; then - gtmroutines="$gtm_dist/libgtmutil$ext $gtmdist" +if [ -f $gtm_dist/libyottadbutil$ext ] ; then + gtmroutines="$gtm_dist/libyottadbutil$ext $gtmdist" else gtmroutines="$gtmdist" fi @@ -757,17 +769,17 @@ fi cd $savedir # Optionally remove .o files if they are in a shared library -if [ -f $gtm_dist/libgtmutil$ext ] ; then - chown ${owner}:${bingroup} $gtm_dist/libgtmutil$ext +if [ -f $gtm_dist/libyottadbutil$ext ] ; then + chown ${owner}:${bingroup} $gtm_dist/libyottadbutil$ext $echo "" - $echo "Object files of M routines placed in shared library $gtm_dist/libgtmutil$ext" + $echo "Object files of M routines placed in shared library $gtm_dist/libyottadbutil$ext" $echo "Keep original .o object files (y or n)? \c" read resp if [ ! -t 0 ] ; then echo "$resp"; fi if [ "n" = "$resp" -o "N" = "$resp" ] ; then rm -f $gtm_dist/*.o $gtm_dist/utf8/*.o ; fi $echo "" - if [ -f $gtm_dist/utf8/libgtmutil$ext ] ; then - chown ${owner}:${bingroup} $gtm_dist/utf8/libgtmutil$ext + if [ -f $gtm_dist/utf8/libyottadbutil$ext ] ; then + chown ${owner}:${bingroup} $gtm_dist/utf8/libyottadbutil$ext fi fi diff --git a/sr_unix/dlopen_libgtmshr.c b/sr_unix/dlopen_libyottadb.c similarity index 75% rename from sr_unix/dlopen_libgtmshr.c rename to sr_unix/dlopen_libyottadb.c index d4a99e1b2..a300d2e82 100644 --- a/sr_unix/dlopen_libgtmshr.c +++ b/sr_unix/dlopen_libyottadb.c @@ -2,7 +2,7 @@ * * * Copyright 2001, 2014 Fidelity Information Services, Inc * * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -19,7 +19,7 @@ */ #include "main_pragma.h" -#undef UNIX /* Causes non-GTM-runtime routines (libgtmshr) to be used since libgtmshr is not yet available */ +#undef UNIX /* Causes non-YottaDB-runtime routines (libyottadb) to be used since libyottadb is not yet available */ #include "gtm_stdio.h" #define UNIX #include "gtm_string.h" @@ -30,10 +30,10 @@ typedef int (*exe_main_t)(int argc, char **argv, char **envp); -int dlopen_libgtmshr(int argc, char **argv, char **envp, char *main_func) +int dlopen_libyottadb(int argc, char **argv, char **envp, char *main_func) { int status; - char gtmshr_file[GTM_PATH_MAX]; + char yottadb_file[GTM_PATH_MAX]; char_ptr_t fptr; int dir_len; void_ptr_t handle; @@ -58,18 +58,18 @@ int dlopen_libgtmshr(int argc, char **argv, char **envp, char *main_func) GTM_DIST_PATH_MAX); return ERR_DISTPATHMAX; } - memcpy(>mshr_file[0], fptr, dir_len); - gtmshr_file[dir_len] = DIR_SEPARATOR; - memcpy(>mshr_file[dir_len + 1], GTMSHR_IMAGE_NAME, STR_LIT_LEN(GTMSHR_IMAGE_NAME)); - gtmshr_file[dir_len + STR_LIT_LEN(GTMSHR_IMAGE_NAME) + 1] = 0; + memcpy(&yottadb_file[0], fptr, dir_len); + yottadb_file[dir_len] = DIR_SEPARATOR; + memcpy(&yottadb_file[dir_len + 1], YOTTADB_IMAGE_NAME, STR_LIT_LEN(YOTTADB_IMAGE_NAME)); + yottadb_file[dir_len + STR_LIT_LEN(YOTTADB_IMAGE_NAME) + 1] = 0; /* RTLD_NOW - resolve immediately so we know errors sooner than later - * RTLD_GLOBAL - make all exported symbols from gtmshr available for subsequent dlopen. + * RTLD_GLOBAL - make all exported symbols from libyottadb.so available for subsequent dlopen. */ - handle = dlopen(>mshr_file[0], (RTLD_NOW | RTLD_GLOBAL)); + handle = dlopen(&yottadb_file[0], (RTLD_NOW | RTLD_GLOBAL)); if (NULL == handle) { - FPRINTF(stderr, "%%GTM-E-DLLNOOPEN, Failed to load external dynamic library %s\n", gtmshr_file); + FPRINTF(stderr, "%%GTM-E-DLLNOOPEN, Failed to load external dynamic library %s\n", yottadb_file); if ((fptr = dlerror()) != NULL) FPRINTF(stderr, "%%GTM-E-TEXT, %s\n", fptr); return ERR_DLLNOOPEN; diff --git a/sr_unix/dse.c b/sr_unix/dse.c index 8424fa9d5..d84b93326 100644 --- a/sr_unix/dse.c +++ b/sr_unix/dse.c @@ -3,6 +3,9 @@ * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * * All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -16,5 +19,5 @@ int main(int argc, char **argv, char **envp) { - return dlopen_libgtmshr(argc, argv, envp, "dse_main"); + return dlopen_libyottadb(argc, argv, envp, "dse_main"); } diff --git a/sr_unix/ftok.c b/sr_unix/ftok.c index a1581ae3d..4b5050d92 100644 --- a/sr_unix/ftok.c +++ b/sr_unix/ftok.c @@ -3,6 +3,9 @@ * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * * All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -16,5 +19,5 @@ int main(int argc, char **argv, char **envp) { - return dlopen_libgtmshr(argc, argv, envp, "ftok_main"); + return dlopen_libyottadb(argc, argv, envp, "ftok_main"); } diff --git a/sr_unix/gtm.c b/sr_unix/gtm.c index a77381168..839a0a407 100755 --- a/sr_unix/gtm.c +++ b/sr_unix/gtm.c @@ -3,7 +3,7 @@ * Copyright (c) 2001-2014 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -17,5 +17,5 @@ int main(int argc, char **argv, char **envp) { - return dlopen_libgtmshr(argc, argv, envp, "gtm_main"); + return dlopen_libyottadb(argc, argv, envp, "gtm_main"); } diff --git a/sr_unix/gtm_env.csh b/sr_unix/gtm_env.csh index b56bdf73a..0932d1446 100755 --- a/sr_unix/gtm_env.csh +++ b/sr_unix/gtm_env.csh @@ -3,7 +3,7 @@ # Copyright (c) 2001-2016 Fidelity National Information # # Services, Inc. and/or its subsidiaries. All rights reserved. # # # -# Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. # +# Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries. # # All rights reserved. # # # # Copyright (c) 2017 Stephen L Johnson. All rights reserved. # @@ -122,7 +122,7 @@ if ( $?gtm_version_change == "1" ) then setenv gt_ld_options_bta "$gt_ld_options_common" setenv gt_ld_options_dbg "$gt_ld_options_common" setenv gt_ld_options_pro "$gt_ld_options_common" - setenv gt_ld_options_gtmshr "" + setenv gt_ld_options_yottadb "" # force the linker to retain gtmci.o & dependent modules even if not referenced. setenv gt_ld_ci_u_option "-Wl,-u,ydb_ci -Wl,-u,gtm_is_main_thread" @@ -254,7 +254,7 @@ endif # Allow platform specific gt_ld_ci related symbol changes # force the linker to retain gtmci.o & dependent modules even if not referenced. -setenv gt_ld_ci_options "$gt_ld_ci_u_option $gt_ld_options_gtmshr" +setenv gt_ld_ci_options "$gt_ld_ci_u_option $gt_ld_options_yottadb" # customization for non-GG environment if !($?gt_as_option_I) then setenv gt_as_option_I "-I$gtm_inc" diff --git a/sr_unix/gtm_icu.c b/sr_unix/gtm_icu.c index 1dafb5156..b03324f37 100755 --- a/sr_unix/gtm_icu.c +++ b/sr_unix/gtm_icu.c @@ -3,6 +3,9 @@ * Copyright (c) 2006-2017 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -369,7 +372,7 @@ void gtm_icu_init(void) } # ifdef __hpux /* HP-UX dlsym() doesn't allow lookup for symbols that are present in the nested dependent shared libraries - * of ICU_LIBNAME. Workaround is to lookup within the global space (i.e. from invoking module libgtmshr) + * of ICU_LIBNAME. Workaround is to lookup within the global space (i.e. from invoking module libyottadb) * where all symbols would have been brought in by previous dlopen() with the RTLD_GLOBAL flag. */ handle = dlopen(NULL, ICU_LIBFLAGS); diff --git a/sr_unix/gtm_permissions.c b/sr_unix/gtm_permissions.c index 2c9b3c00c..61d8db272 100755 --- a/sr_unix/gtm_permissions.c +++ b/sr_unix/gtm_permissions.c @@ -3,6 +3,9 @@ * Copyright (c) 2009-2017 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -33,11 +36,7 @@ GBLDEF int gid_list_len = 0; GBLREF char gtm_dist[GTM_PATH_MAX]; GBLREF boolean_t gtm_dist_ok_to_use; -#if defined(__MVS__) -# define LIBGTMSHR "%s/libgtmshr.dll" -#else -# define LIBGTMSHR "%s/libgtmshr.so" -#endif +#define LIBYOTTADB "%s/libyottadb.so" /* Get the process's group list and stash the information to avoid repeated calls */ void gtm_init_gid_list(void) @@ -74,9 +73,9 @@ boolean_t gtm_gid_in_gid_list(gid_t gid) return TRUE; return FALSE; } -/* Return the group id of the distribution based on libgtmshr.xx[x]. If there is some - * problem accessing that file then return INVALID_GID which signals no change to group. Otherwise, - * the pointer to the stat buffer will contain the result of the call to STAT_FILE. +/* Return the group id of the distribution based on libyottadb.so. + * If there is some problem accessing that file then return INVALID_GID which signals no change to group. + * Otherwise, the pointer to the stat buffer will contain the result of the call to STAT_FILE. */ gid_t gtm_get_group_id(struct stat *stat_buff) { @@ -92,8 +91,8 @@ gid_t gtm_get_group_id(struct stat *stat_buff) } if (gtm_dist_ok_to_use) { - /* build a path to libgtmshr.so or .sl on hpux or .dll on zos */ - SNPRINTF(temp, SIZEOF(temp), LIBGTMSHR, gtm_dist); + /* build a path to libyottadb.so */ + SNPRINTF(temp, SIZEOF(temp), LIBYOTTADB, gtm_dist); STAT_FILE(temp, stat_buff, ret_stat); if (0 == ret_stat) { diff --git a/sr_unix/gtm_stdio.c b/sr_unix/gtm_stdio.c index 7b6ab3fbd..bda132b07 100644 --- a/sr_unix/gtm_stdio.c +++ b/sr_unix/gtm_stdio.c @@ -3,6 +3,9 @@ * Copyright (c) 2010-2015 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -64,7 +67,7 @@ int gtm_fprintf(FILE *stream, const char *format, ...) sigset_t savemask; /* Note: cannot use SIGPROCMASK below because this function is used by "gtmsecshr" and using SIGPROCMASK - * pulls in a lot of stuff from libgtmshr.so (due to asserts) and we want minimal stuff in "gtmsecshr". + * pulls in a lot of stuff from libyottadb.so (due to asserts) and we want minimal stuff in "gtmsecshr". */ if (blocksig_initialized) sigprocmask(SIG_BLOCK, &block_sigsent, &savemask); /* BYPASSOK(sigprocmask) */ diff --git a/sr_unix/gtm_stdio.h b/sr_unix/gtm_stdio.h index f1602c66d..71e6fe148 100755 --- a/sr_unix/gtm_stdio.h +++ b/sr_unix/gtm_stdio.h @@ -3,6 +3,9 @@ * Copyright (c) 2010-2015 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -18,7 +21,7 @@ /* This header is split between sr_unix and sr_vvms because there are several test system and standalone modules * that do not #define UNIX or VMS for us to know which defines to proceed with. So now this split makes * that determination unnecessary. Note we still use the definition of UNIX or not in THIS header to indicate the - * compilation of a GTM source file or a standalone file not needing (or able to get to) libgtmshr wrappers. + * compilation of a YottaDB source file or a standalone file not needing (or able to get to) libyottadb wrappers. */ #include diff --git a/sr_unix/gtm_tls_impl.c b/sr_unix/gtm_tls_impl.c index 74fc3cb8f..ce72697c5 100644 --- a/sr_unix/gtm_tls_impl.c +++ b/sr_unix/gtm_tls_impl.c @@ -3,6 +3,9 @@ * Copyright (c) 2013-2016 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -499,8 +502,8 @@ gtm_tls_ctx_t *gtm_tls_init(int version, int flags) return NULL; /* Relevant error detail populated in the above macro. */ } OpenSSL_add_all_algorithms(); - /* Setup function pointers to symbols exported by libgtmshr.so. */ - if (0 != gc_load_gtmshr_symbols()) + /* Setup function pointers to symbols exported by libyottadb.so. */ + if (0 != gc_load_yottadb_symbols()) return NULL; /* Setup a SSL context that allows SSLv3 and TLSv1.x but no SSLv2 (which is deprecated due to a great number of security * vulnerabilities). diff --git a/sr_unix/gtmci.c b/sr_unix/gtmci.c index db39fe480..8dd0f1a43 100644 --- a/sr_unix/gtmci.c +++ b/sr_unix/gtmci.c @@ -3,6 +3,9 @@ * Copyright (c) 2001-2016 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * * All rights reserved. * * * @@ -1106,7 +1109,7 @@ int ydb_exit() } } gtm_exit_handler(); /* rundown all open database resource */ - /* If libgtmshr was loaded via (or on account of) dlopen() and is later unloaded via dlclose() + /* If libyottadb was loaded via (or on account of) dlopen() and is later unloaded via dlclose() * the exit handler on AIX and HPUX still tries to call the registered atexit() handler causing * 'problems'. AIX 5.2 and later have the below unatexit() call to unregister the function if * our exit handler has already been called. Linux and Solaris don't need this, looking at the @@ -1130,12 +1133,12 @@ void ydb_zstatus(char *msg, int len) } #ifdef _AIX -/* If libgtmshr was loaded via (or on account of) dlopen() and is later unloaded via dlclose() +/* If libyottadb was loaded via (or on account of) dlopen() and is later unloaded via dlclose() * the exit handler on AIX and HPUX still tries to call the registered atexit() handler causing * 'problems'. AIX 5.2 and later have the below unatexit() call to unregister the function if * our exit handler has already been called. Linux and Solaris don't need this, looking at the * other platforms we support to see if resolutions can be found. This routine will be called - * by the OS when libgtmshr is unloaded. Specified with the -binitfini loader option on AIX + * by the OS when libyottadb is unloaded. Specified with the -binitfini loader option on AIX * to be run when the shared library is unloaded. 06/2007 SE */ void gtmci_cleanup(void) diff --git a/sr_unix/gtmcrypt_ref.c b/sr_unix/gtmcrypt_ref.c index b9d4cf0b0..ad7a4abb5 100644 --- a/sr_unix/gtmcrypt_ref.c +++ b/sr_unix/gtmcrypt_ref.c @@ -3,6 +3,9 @@ * Copyright (c) 2009-2016 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -38,10 +41,6 @@ #include "gtmcrypt_sym_ref.h" #include "gtmcrypt_pk_ref.h" -#ifdef __MVS__ -#define GTMSHR_IMAGENAME "libgtmshr.dll" -#endif - #define CHECK_IV_LENGTH(IV) \ { \ if (IV.length > GTMCRYPT_IV_LEN) \ @@ -81,7 +80,7 @@ gtm_status_t gtmcrypt_init(gtm_int_t flags) if (gtmcrypt_inited) return 0; - if (0 != gc_load_gtmshr_symbols()) + if (0 != gc_load_yottadb_symbols()) return -1; # ifdef USE_GCRYPT gcry_set_log_handler(gtm_gcry_log_handler, NULL); diff --git a/sr_unix/gtmcrypt_util.c b/sr_unix/gtmcrypt_util.c index 65f54aeaa..4e0b7019c 100644 --- a/sr_unix/gtmcrypt_util.c +++ b/sr_unix/gtmcrypt_util.c @@ -3,6 +3,9 @@ * Copyright (c) 2013-2017 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -94,7 +97,7 @@ GBLDEF gtm_free_fnptr_t gtm_free_fnptr; } #endif -int gc_load_gtmshr_symbols() +int gc_load_yottadb_symbols() { /* CYGWIN TODO: This is to fix a linker error. Undo when it is fixed. */ # if !defined(USE_SYSLIB_FUNCS) && !defined(__CYGWIN__) diff --git a/sr_unix/gtmcrypt_util.h b/sr_unix/gtmcrypt_util.h index f5a855ebf..65e579b5b 100644 --- a/sr_unix/gtmcrypt_util.h +++ b/sr_unix/gtmcrypt_util.h @@ -3,6 +3,9 @@ * Copyright (c) 2013-2017 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -235,7 +238,7 @@ GBLREF gtm_free_fnptr_t gtm_free_fnptr; GBLREF char gtmcrypt_err_string[MAX_GTMCRYPT_ERR_STRLEN]; -int gc_load_gtmshr_symbols(void); +int gc_load_yottadb_symbols(void); void gtm_gcry_log_handler(void *opaque, int level, const char *fmt, va_list arg_ptr); int gc_read_passwd(char *prompt, char *buf, int maxlen, void *tty); int gc_mask_unmask_passwd(int nparm, gtm_string_t *in, gtm_string_t *out); diff --git a/sr_unix/gtmgblstat.xc b/sr_unix/gtmgblstat.xc index 117940b61..5fe12ce02 100644 --- a/sr_unix/gtmgblstat.xc +++ b/sr_unix/gtmgblstat.xc @@ -1,4 +1,4 @@ -$gtm_dist/libgtmshr.so +$gtm_dist/libyottadb.so accumulate: gtm_status_t accumulate(IO:gtm_string_t*, I:gtm_string_t*) isbigendian: gtm_status_t is_big_endian(O:gtm_uint_t*) toulong: gtm_status_t to_ulong(O:gtm_ulong_t*, I:gtm_string_t*) diff --git a/sr_unix/gtmprofile.gtc b/sr_unix/gtmprofile.gtc index a014c00c1..2496a57a5 100755 --- a/sr_unix/gtmprofile.gtc +++ b/sr_unix/gtmprofile.gtc @@ -2,6 +2,9 @@ # # # Copyright (c) 2010-2017 Fidelity National Information # # Services, Inc. and/or its subsidiaries. All rights reserved. # +# # +# Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. # +# All rights reserved. # # # # This source code contains the intellectual property # # of its copyright holder(s), and is made available # @@ -49,8 +52,8 @@ fi if [ -n "$gtm_dist" ] ; then old_gtm_dist=$gtm_dist if [ -f $gtm_dist/_XCMD.m ] ; then - tmp_gtm_shlib=`basename $gtm_dist/libgtmshr.* | cut -d . -f 2` ; export tmp_gtm_shlib - if [ -f "$gtm_dist/libgtmutil.$tmp_gtm_shlib" ] ; then gtmroutines="$gtm_dist/libgtmutil.$tmp_gtm_shlib" + tmp_gtm_shlib=`basename $gtm_dist/libyottadb.* | cut -d . -f 2` ; export tmp_gtm_shlib + if [ -f "$gtm_dist/libyottadbutil.$tmp_gtm_shlib" ] ; then gtmroutines="$gtm_dist/libyottadbutil.$tmp_gtm_shlib" else gtmroutines=$gtm_dist ; fi export gtmroutines old_gtmver=`$gtm_dist/mumps -run %XCMD 'Write $Piece($ZVersion," ",2),"_",$Piece($ZVersion," ",4)'` @@ -64,14 +67,14 @@ fi gtm_dist="GTMDIST" ; export gtm_dist # Determine name of shared library file name extension on this platform -tmp_gtm_shlib=`basename $gtm_dist/libgtmshr.* | cut -d . -f 2` ; export tmp_gtm_shlib +tmp_gtm_shlib=`basename $gtm_dist/libyottadb.* | cut -d . -f 2` ; export tmp_gtm_shlib # Idempotence says change the environment only if a new GT.M directory is being pointed to # otherwise just restore $gtmroutines and exit if [ $gtm_dist != "$old_gtm_dist" ] ; then # Force $gtmroutines to guarantee access to %XCMD for now; repaired later - if [ -f "$gtm_dist/libgtmutil.$tmp_gtm_shlib" ] ; then gtmroutines="$gtm_dist/libgtmutil.$tmp_gtm_shlib $gtm_dist" + if [ -f "$gtm_dist/libyottadbutil.$tmp_gtm_shlib" ] ; then gtmroutines="$gtm_dist/libyottadbutil.$tmp_gtm_shlib $gtm_dist" else gtmroutines=$gtm_dist ; fi export gtmroutines # Set $gtm_icu_version if icu-config is available - should be set before checking for UTF-8 mode @@ -104,8 +107,8 @@ if [ $gtm_dist != "$old_gtm_dist" ] ; then echo $LC_CTYPE | grep -i .utf > /dev/null if [ $? = 0 -a "`echo Halt | gtm_prompt='YDB>' $gtm_dist/utf8/mumps -dir | tail -n 1`" = 'YDB>' ] ; then gtm_dist=$gtm_dist/utf8 - if [ -f "$gtm_dist/libgtmutil.$tmp_gtm_shlib" ] ; then - gtmroutines="$gtm_dist/libgtmutil.$tmp_gtm_shlib $gtm_dist" + if [ -f "$gtm_dist/libyottadbutil.$tmp_gtm_shlib" ] ; then + gtmroutines="$gtm_dist/libyottadbutil.$tmp_gtm_shlib $gtm_dist" else gtmroutines=$gtm_dist ; fi fi fi @@ -150,7 +153,7 @@ if [ $gtm_dist != "$old_gtm_dist" ] ; then gtmroutines=`echo $gtmroutines | sed "s;$old_gtmver;$gtmver;"` fi else - if [ -f "$gtm_dist/libgtmutil.$tmp_gtm_shlib" ] ; then gtmroutines="$gtm_dist/libgtmutil.$tmp_gtm_shlib $gtm_dist" + if [ -f "$gtm_dist/libyottadbutil.$tmp_gtm_shlib" ] ; then gtmroutines="$gtm_dist/libyottadbutil.$tmp_gtm_shlib $gtm_dist" else gtmroutines=$gtm_dist ; fi if [ "utf8" = `basename $gtm_dist` ] ; then if [ -d $gtm_dist/plugin/o/utf8 ] ; then diff --git a/sr_unix/gtmsecshr.c b/sr_unix/gtmsecshr.c index e1cb346fc..d209d30e0 100755 --- a/sr_unix/gtmsecshr.c +++ b/sr_unix/gtmsecshr.c @@ -3,7 +3,7 @@ * Copyright (c) 2001-2017 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -974,7 +974,7 @@ void service_request(gtmsecshr_mesg *buf, int msglen, char *rundir, int rundir_l * * 1. Target process has an execution directory the same as ours ($gtm_dist). Note it is possible a target process is doing * a call-in so this test is not always TRUE but is the faster of the two tests. - * 2. Target process has libgtmshr.{suffix} (aka GTMSHR_IMAGE_NAME from mdefsa.h) loaded which we can tell by examining the + * 2. Target process has libyottadb.{suffix} (aka YOTTADB_IMAGE_NAME from mdefsa.h) loaded which we can tell by examining the * open files of the target process. * * Note - this routine is currently NOT USED as it is incomplete and not yet implemented for all platforms. We leave it in here @@ -1040,7 +1040,7 @@ int validate_receiver(gtmsecshr_mesg *buf, char *rundir, int rundir_len, int sav return 0; } } - /* Check #1 failed - attempt check #2 - read /proc//maps to see if libgtmshr is there */ + /* Check #1 failed - attempt check #2 - read /proc//maps to see if libyottadb is there */ memcpy(ppptr_save, PROCPATH_MAPSSUFFIX, SIZEOF(PROCPATH_MAPSSUFFIX)); /* Copy includes terminating null of literal */ Fopen(procstrm, procpath, "r"); if (NULL == procstrm) diff --git a/sr_unix/gtmsecshr_sock_init.c b/sr_unix/gtmsecshr_sock_init.c index cc4affd33..48d00acdd 100755 --- a/sr_unix/gtmsecshr_sock_init.c +++ b/sr_unix/gtmsecshr_sock_init.c @@ -1,6 +1,9 @@ /**************************************************************** * * - * Copyright 2001, 2014 Fidelity Information Services, Inc * + * Copyright 2001, 2014 Fidelity Information Services, Inc * + * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * @@ -290,8 +293,8 @@ int4 gtmsecshr_sock_init(int caller) ret_status = BINDERR; } else if ('\0' != suffix) ret_status = ONETIMESOCKET; - /* If ret_status is zero do the following checks if $gtm_dist/libgtmshr.so is not world accessible - * then set mode to 0660 and change the gid to the gid of $gtm_dist/libgtmshr.so if different from + /* If ret_status is zero do the following checks if $gtm_dist/libyottadb.so is not world accessible + * then set mode to 0660 and change the gid to the gid of $gtm_dist/libyottadb.so if different from * current user. */ if (!ret_status) diff --git a/sr_unix/gtmsource_process.c b/sr_unix/gtmsource_process.c index 7798693c0..7ed1f5b8f 100644 --- a/sr_unix/gtmsource_process.c +++ b/sr_unix/gtmsource_process.c @@ -3,6 +3,9 @@ * Copyright (c) 2006-2017 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -792,7 +795,7 @@ int gtmsource_process(void) * is taken from the jnlpool_ctl->jnl_seqno right when we detected the online rollback. We could have set * this right when we set gtmsource_save_read_jnl_seqno but we don't do that because we want to print the * old value in the log file but we can't use repl_log/gtmsource_log_fp in gtmsource_onln_rlbk_clnup() as - * it is bundled up as part of libgtmshr.so whereas repl_log is bundled in libmupip.a. + * it is bundled up as part of libyottadb.so whereas repl_log is bundled in libmupip.a. */ gtmsource_local->read_jnl_seqno = gtmsource_save_read_jnl_seqno; repl_log(gtmsource_log_fp, TRUE, TRUE, "REPL INFO - Source Server Read Seqno is now set to : "INT8_FMT"\n", diff --git a/sr_unix/init_gtm.c b/sr_unix/init_gtm.c index 6e219f299..e2ab4a842 100644 --- a/sr_unix/init_gtm.c +++ b/sr_unix/init_gtm.c @@ -3,6 +3,9 @@ * Copyright (c) 2001-2017 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -177,7 +180,7 @@ void init_gtm(void) EXIT(gtm_compile()); } /* With the advent of reservedDBs, the ability to create a new database is not only in MUPIP but is in MUMPS too. - * This means mucregini() (called by mu_cre_file()) is also in libgtmshr. But mucregini calls mupip_exit for certain + * This means mucregini() (called by mu_cre_file()) is also in libyottadb. But mucregini calls mupip_exit for certain * types of errors we won't run into with reservedDBs. So, if mupip.c has not already initialized this function * pointer for mupip_exit to be used in mucregini() (MUPIP calls this routine too), then initialize it to point to a * routine that will assert fail if it is used in MUMPS . diff --git a/sr_unix/kitstart.csh b/sr_unix/kitstart.csh index 87eb32e57..4a0fcd99c 100755 --- a/sr_unix/kitstart.csh +++ b/sr_unix/kitstart.csh @@ -4,7 +4,7 @@ # Copyright (c) 2011-2018 Fidelity National Information # # Services, Inc. and/or its subsidiaries. All rights reserved. # # # -# Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. # +# Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries. # # All rights reserved. # # # # This source code contains the intellectual property # @@ -421,9 +421,9 @@ if ($testinstall) then # restricted build. # V54002 now asks for an installation group (newline entered for default) so response needs one more # blank line for default group - # V54003 now asks whether or not to retain .o files if libgtmutil.so is created + # V54003 now asks whether or not to retain .o files if libyottadbutil.so is created # We answer "y" to this question - # If libgtmutil.so is not created(on i586) this question is not asked + # If libyottadbutil.so is not created(on i586) this question is not asked if ("$osname" == "linux" && "$arch" == "i586") then sh ./configure << CONFIGURE_EOF @@ -458,9 +458,9 @@ CONFIGURE_EOF # V54002 now asks for an installation group before the restricted group question so response is # reversed from V54000 - # V54003 now asks whether or not to retain .o files if libgtmutil.so is created + # V54003 now asks whether or not to retain .o files if libyottadbutil.so is created # We answer "y" to this question - # If libgtmutil.so is not created(on i586) this question is not asked + # If libyottadbutil.so is not created(on i586) this question is not asked if ("$osname" == "linux" && "$arch" == "i586") then sh ./configure << CONFIGURE_EOF diff --git a/sr_unix/libyottadb.h b/sr_unix/libyottadb.h index c5c1a9a72..34d812d18 100755 --- a/sr_unix/libyottadb.h +++ b/sr_unix/libyottadb.h @@ -3,7 +3,7 @@ * Copyright (c) 2001-2017 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -70,7 +70,7 @@ ydb_status_t ydb_cij(const char *c_rtn_name, char **arg_blob, int count, int *ar unsigned int *has_ret_value); void ydb_zstatus(char* msg, int len); -/* Other entry points accessable in libgtmshr. */ +/* Other entry points accessable in libyottadb.so */ ydb_status_t gtm_filename_to_id(ydb_string_t *filename, ydb_fileid_ptr_t *fileid); void gtm_hiber_start(ydb_uint_t mssleep); void gtm_hiber_start_wait_any(ydb_uint_t mssleep); diff --git a/sr_unix/lke.c b/sr_unix/lke.c index e0c475e48..0f5dd804f 100644 --- a/sr_unix/lke.c +++ b/sr_unix/lke.c @@ -1,6 +1,6 @@ /**************************************************************** * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -16,5 +16,5 @@ int main(int argc, char **argv, char **envp) { - return dlopen_libgtmshr(argc, argv, envp, "lke_main"); + return dlopen_libyottadb(argc, argv, envp, "lke_main"); } diff --git a/sr_unix/mdefsa.h b/sr_unix/mdefsa.h index d60c5720e..1cff78eca 100755 --- a/sr_unix/mdefsa.h +++ b/sr_unix/mdefsa.h @@ -3,6 +3,9 @@ * Copyright (c) 2001-2016 Fidelity National Information * * Services, Inc. and/or its subsidiaries. All rights reserved. * * * + * Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. * + * All rights reserved. * + * * * This source code contains the intellectual property * * of its copyright holder(s), and is made available * * under a license. If you do not know the terms of * @@ -34,34 +37,10 @@ MBSTART { \ #define ICU_LIBFLAGS (RTLD_NOW | RTLD_GLOBAL) -#define ICU_LIBNAME_ROOT "libicuio" -#ifdef __hpux -# ifdef __ia64 -# define GTMSHR_IMAGE_NAME "libgtmshr.so" -# else -# define GTMSHR_IMAGE_NAME "libgtmshr.sl" -# endif -# define ICU_LIBNAME_EXT "sl" -#elif defined(__MVS__) -# define GTMSHR_IMAGE_NAME "libgtmshr.dll" -# define ICU_LIBNAME_EXT "so" -#elif defined(__CYGWIN__) -# define GTMSHR_IMAGE_NAME "libgtmshr.dll" -# define ICU_LIBNAME_EXT "dll" -#else -# define GTMSHR_IMAGE_NAME "libgtmshr.so" -# ifdef _AIX - /* Conventionally, AIX archives shared objects into a static library. - * So we need to link with a member of the library instead of the library itself. - */ -# define ICU_LIBNAME_EXT "a" - /* AIX system default ICU library uses a different convention for the library name */ -# define ICU_LIBNAME_DEF ICU_LIBNAME_ROOT "." ICU_LIBNAME_EXT "(shr_64.o)" -# else -# define ICU_LIBNAME_EXT "so" -# endif -#endif -#define ICU_LIBNAME ICU_LIBNAME_ROOT "." ICU_LIBNAME_EXT +#define ICU_LIBNAME_ROOT "libicuio" +#define YOTTADB_IMAGE_NAME "libyottadb.so" +#define ICU_LIBNAME_EXT "so" +#define ICU_LIBNAME ICU_LIBNAME_ROOT "." ICU_LIBNAME_EXT #define GTM_MAIN_FUNC "gtm_main" diff --git a/sr_unix/mupip.c b/sr_unix/mupip.c index 9d92b6268..977b295a9 100644 --- a/sr_unix/mupip.c +++ b/sr_unix/mupip.c @@ -1,6 +1,6 @@ /**************************************************************** * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -16,5 +16,5 @@ int main(int argc, char **argv, char **envp) { - return dlopen_libgtmshr(argc, argv, envp, "mupip_main"); + return dlopen_libyottadb(argc, argv, envp, "mupip_main"); } diff --git a/sr_unix/pinentry-gtm.sh b/sr_unix/pinentry-gtm.sh index d038fa5a6..0eef32b7a 100755 --- a/sr_unix/pinentry-gtm.sh +++ b/sr_unix/pinentry-gtm.sh @@ -3,6 +3,9 @@ # # # Copyright (c) 2010-2017 Fidelity National Information # # Services, Inc. and/or its subsidiaries. All rights reserved. # +# # +# Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. # +# All rights reserved. # # # # This source code contains the intellectual property # # of its copyright holder(s), and is made available # @@ -42,10 +45,10 @@ if [ -n "$gtm_passwd" -a -x "$gtm_dist/mumps" ] ; then if [ "`echo $gtm_chset | tr utf UTF`" = "UTF-8" -a -x "$dir/../../utf8/mumps" ] ; then utfodir="/utf8" fi - # $gtmroutines is not set in the environment, attempt to pick it up from libgtmutil.so, + # $gtmroutines is not set in the environment, attempt to pick it up from libyottadbutil.so, # $gtm_dist, $gtm_dist/plugin/o - if [ -e "$gtm_dist/libgtmutil.so" ] ; then - gtmroutines="$gtm_dist/libgtmutil.so" + if [ -e "$gtm_dist/libyottadbutil.so" ] ; then + gtmroutines="$gtm_dist/libyottadbutil.so" export gtmroutines elif [ -e "$gtm_dist/PINENTRY.o" ] ; then pinentry=PINENTRY diff --git a/sr_unix/gtmexe_symbols.exp b/sr_unix/ydbexe_symbols.exp similarity index 100% rename from sr_unix/gtmexe_symbols.exp rename to sr_unix/ydbexe_symbols.exp diff --git a/sr_unix/ydbinstall.sh b/sr_unix/ydbinstall.sh index bca00a40c..8d6fae83f 100755 --- a/sr_unix/ydbinstall.sh +++ b/sr_unix/ydbinstall.sh @@ -532,7 +532,7 @@ else echo y >>$gtm_configure_in # Response to : "Should UTF-8 support be insta fi fi echo $gtm_lcase_utils >>$gtm_configure_in # Response to : "Do you want uppercase and lowercase versions of the MUMPS routines?" -if [ "Y" = $gtm_shlib_support ] ; then echo $gtm_keep_obj >>$gtm_configure_in ; fi # Response to : "Object files of M routines placed in shared library $gtm_dist/libgtmutil$ext. Keep original .o object files (y or n)?" +if [ "Y" = $gtm_shlib_support ] ; then echo $gtm_keep_obj >>$gtm_configure_in ; fi # Response to : "Object files of M routines placed in shared library $gtm_dist/libyottadbutil$ext. Keep original .o object files (y or n)?" echo n >>$gtm_configure_in # Response to : "Installation completed. Would you like all the temporary files removed from this directory?" if [ "Y" = "$gtm_verbose" ] ; then echo Prepared configuration file ; cat $gtm_configure_in ; dump_info ; fi diff --git a/sr_unix/gtmshr_symbols.exp b/sr_unix/yottadb_symbols.exp similarity index 100% rename from sr_unix/gtmshr_symbols.exp rename to sr_unix/yottadb_symbols.exp diff --git a/sr_unix_cm/gtcm_play.c b/sr_unix_cm/gtcm_play.c index e3626e040..10af44990 100644 --- a/sr_unix_cm/gtcm_play.c +++ b/sr_unix_cm/gtcm_play.c @@ -1,6 +1,6 @@ /**************************************************************** * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -17,5 +17,5 @@ int main(int argc, char **argv, char **envp) { - return dlopen_libgtmshr(argc, argv, envp, "gtcm_play_main"); + return dlopen_libyottadb(argc, argv, envp, "gtcm_play_main"); } diff --git a/sr_unix_cm/gtcm_server.c b/sr_unix_cm/gtcm_server.c index 6deda2b60..79e6b5492 100644 --- a/sr_unix_cm/gtcm_server.c +++ b/sr_unix_cm/gtcm_server.c @@ -1,6 +1,6 @@ /**************************************************************** * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -17,5 +17,5 @@ int main(int argc, char **argv, char **envp) { - return dlopen_libgtmshr(argc, argv, envp, "gtcm_server_main"); + return dlopen_libyottadb(argc, argv, envp, "gtcm_server_main"); } diff --git a/sr_unix_cm/gtcm_shmclean.c b/sr_unix_cm/gtcm_shmclean.c index 897581229..8ee2ae661 100644 --- a/sr_unix_cm/gtcm_shmclean.c +++ b/sr_unix_cm/gtcm_shmclean.c @@ -1,6 +1,6 @@ /**************************************************************** * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -16,5 +16,5 @@ int main(int argc, char **argv, char **envp) { - return dlopen_libgtmshr(argc, argv, envp, "gtcm_shmclean_main"); + return dlopen_libyottadb(argc, argv, envp, "gtcm_shmclean_main"); } diff --git a/sr_unix_gnp/gtcm_gnp_server.c b/sr_unix_gnp/gtcm_gnp_server.c index 2a40f9334..2bb4ec092 100644 --- a/sr_unix_gnp/gtcm_gnp_server.c +++ b/sr_unix_gnp/gtcm_gnp_server.c @@ -1,6 +1,6 @@ /**************************************************************** * * - * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. * + * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.* * All rights reserved. * * * * This source code contains the intellectual property * @@ -16,5 +16,5 @@ int main(int argc, char **argv, char **envp) { - return dlopen_libgtmshr(argc, argv, envp, "gtcm_gnp_server_main"); + return dlopen_libyottadb(argc, argv, envp, "gtcm_gnp_server_main"); }