Author: ydario
Date: Tue Jun 19 12:58:16 2012
New Revision: 1351690
URL: http://svn.apache.org/viewvc?rev=1351690&view=rev
Log:
i118923 - OS/2 port: fix change of local LIBPATH.
Modified:
incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx
Modified: incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx?rev=1351690&r1=1351689&r2=1351690&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx
(original)
+++ incubator/ooo/trunk/main/desktop/os2/source/applauncher/launcher.cxx Tue
Jun 19 12:58:16 2012
@@ -54,10 +54,14 @@ int main( int argc, char* argv[])
DosQueryModuleName(pib->pib_hmte, sizeof(szApplicationName),
szApplicationName);
// adjust libpath
+#if OSL_DEBUG_LEVEL > 0
+ rc = DosQueryExtLIBPATH( (PSZ)szLibpath, BEGIN_LIBPATH);
+ fprintf( stderr, "1 BeginLibPath: %s\n", szLibpath);
+#endif
_splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
char* basedir = strstr( szDir, "\\PROGRAM\\");
if (basedir) *basedir = 0;
- sprintf( szLibpath,
"\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%BeginLIBPATH%",
+ sprintf( szLibpath,
"\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%%BeginLIBPATH%%;",
szDrive, szDir, szDrive, szDir);
DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH);
// make sure we load DLL from our path only, so multiple
instances/versions
@@ -67,6 +71,10 @@ int main( int argc, char* argv[])
// java cannot load with this flag enabled
DosSetExtLIBPATH( (PCSZ)"T", LIBPATHSTRICT);
#endif
+#if OSL_DEBUG_LEVEL > 0
+ rc = DosQueryExtLIBPATH( (PSZ)szLibpath, BEGIN_LIBPATH);
+ fprintf( stderr, "2 BeginLibPath: %s\n", szLibpath);
+#endif
// adjust exe name
_splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
