From c8a7b2b66db5025526a0dba1b0d33dcf1b93f985 Mon Sep 17 00:00:00 2001

From: Michael Meeks <michael.meeks@collabora.com>

Date: Tue, 18 Aug 2015 12:09:08 +0100

Subject: [PATCH 096/398] lok: namespace and re-work various types & helper

 functions.

Change-Id: I36e2a01822883251f9556fcde0e0a9830356ac98

Reviewed-on: https://gerrit.libreoffice.org/17833

Tested-by: Jenkins <ci@libreoffice.org>

Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

Tested-by: Michael Meeks <michael.meeks@collabora.com>

(cherry picked from commit a5d5ce5dfa0f0cdd048192d60c70da575a6f1735)

---

 include/LibreOfficeKit/LibreOfficeKitInit.h | 60 ++++++++++++++++++-----------

 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h

index f1966c764605..c2f342661e31 100644

--- a/include/LibreOfficeKit/LibreOfficeKitInit.h

+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h

@@ -40,7 +40,7 @@ extern "C"

     #endif

     #define SEPARATOR         '/'

-    void *_dlopen(const char *pFN)

+    void *lok_loadlib(const char *pFN)

     {

         return dlopen(pFN, RTLD_LAZY

 #if defined __clang__ && defined __linux__ \

@@ -52,17 +52,17 @@ extern "C"

                       );

     }

-    char *_dlerror(void)

+    char *lok_dlerror(void)

     {

         return dlerror();

     }

-    void *_dlsym(void *Hnd, const char *pName)

+    void *lok_dlsym(void *Hnd, const char *pName)

     {

         return dlsym(Hnd, pName);

     }

-    int _dlclose(void *Hnd)

+    int lok_dlclose(void *Hnd)

     {

         return dlclose(Hnd);

     }

@@ -80,24 +80,24 @@ extern "C"

     #define SEPARATOR         '\\'

     #define UNOPATH           "\\..\\URE\\bin"

-    void *_dlopen(const char *pFN)

+    void *lok_loadlib(const char *pFN)

     {

         return (void *) LoadLibrary(pFN);

     }

-    char *_dlerror(void)

+    char *lok_dlerror(void)

     {

         LPSTR buf = NULL;

         FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, reinterpret_cast<LPSTR>(&buf), 0, NULL);

         return buf;

     }

-    void *_dlsym(void *Hnd, const char *pName)

+    void *lok_dlsym(void *Hnd, const char *pName)

     {

         return GetProcAddress((HINSTANCE) Hnd, pName);

     }

-    int _dlclose(void *Hnd)

+    int lok_dlclose(void *Hnd)

     {

         return FreeLibrary((HINSTANCE) Hnd);

     }

@@ -139,16 +139,12 @@ extern "C"

     }

 #endif

-typedef LibreOfficeKit *(HookFunction)( const char *install_path);

-

-typedef LibreOfficeKit *(HookFunction2)( const char *install_path, const char *user_profile_path );

-

-static LibreOfficeKit *lok_init_2( const char *install_path,  const char *user_profile_path )

+static void *lok_dlopen( const char *install_path, char ** _imp_lib )

 {

     char *imp_lib;

     void *dlhandle;

-    HookFunction *pSym;

-    HookFunction2 *pSym2;

+

+    *_imp_lib = NULL;

 #if !(defined(__APPLE__) && defined(__arm__))

     size_t partial_length;

@@ -172,7 +168,7 @@ static LibreOfficeKit *lok_init_2( const char *install_path,  const char *user_p

     imp_lib[partial_length++] = SEPARATOR;

     strcpy(imp_lib + partial_length, TARGET_LIB);

-    dlhandle = _dlopen(imp_lib);

+    dlhandle = lok_loadlib(imp_lib);

     if (!dlhandle)

     {

         // If TARGET_LIB exists, and likely is a real library (not a

@@ -183,18 +179,18 @@ static LibreOfficeKit *lok_init_2( const char *install_path,  const char *user_p

         if (stat(imp_lib, &st) == 0 && st.st_size > 100)

         {

             fprintf(stderr, "failed to open library '%s': %s\n",

-                    imp_lib, _dlerror());

+                    imp_lib, lok_dlerror());

             free(imp_lib);

             return NULL;

         }

         strcpy(imp_lib + partial_length, TARGET_MERGED_LIB);

-        dlhandle = _dlopen(imp_lib);

+        dlhandle = lok_loadlib(imp_lib);

         if (!dlhandle)

         {

             fprintf(stderr, "failed to open library '%s': %s\n",

-                    imp_lib, _dlerror());

+                    imp_lib, lok_dlerror());

             free(imp_lib);

             return NULL;

         }

@@ -203,23 +199,41 @@ static LibreOfficeKit *lok_init_2( const char *install_path,  const char *user_p

     imp_lib = strdup("the app executable");

     dlhandle = RTLD_MAIN_ONLY;

 #endif

+    *_imp_lib = imp_lib;

+    return dlhandle;

+}

+

+typedef LibreOfficeKit *(LokHookFunction)( const char *install_path);

+

+typedef LibreOfficeKit *(LokHookFunction2)( const char *install_path, const char *user_profile_path );

+

+typedef int             (LokHookPreInit)  ( const char *install_path, const char *user_profile_path );

+

+static LibreOfficeKit *lok_init_2( const char *install_path,  const char *user_profile_path )

+{

+    char *imp_lib;

+    void *dlhandle;

+    LokHookFunction *pSym;

+    LokHookFunction2 *pSym2;

+

+    dlhandle = lok_dlopen(install_path, &imp_lib);

-    pSym2 = (HookFunction2 *) _dlsym( dlhandle, "libreofficekit_hook_2" );

+    pSym2 = (LokHookFunction2 *) lok_dlsym(dlhandle, "libreofficekit_hook_2");

     if (!pSym2)

     {

         if (user_profile_path != NULL)

         {

             fprintf( stderr, "the LibreOffice version in '%s' does not support passing a user profile to the hook function\n",

                      imp_lib );

-            _dlclose( dlhandle );

+            lok_dlclose( dlhandle );

             free( imp_lib );

             return NULL;

         }

-        pSym = (HookFunction *) _dlsym( dlhandle, "libreofficekit_hook" );

+        pSym = (LokHookFunction *) lok_dlsym( dlhandle, "libreofficekit_hook" );

         if (!pSym)

         {

             fprintf( stderr, "failed to find hook in library '%s'\n", imp_lib );

-            _dlclose( dlhandle );

+            lok_dlclose( dlhandle );

             free( imp_lib );

             return NULL;

         }

-- 

2.12.0