diff options
author | Yuri Dario <ydario@apache.org> | 2013-10-27 11:04:32 +0000 |
---|---|---|
committer | Yuri Dario <ydario@apache.org> | 2013-10-27 11:04:32 +0000 |
commit | 051d1cb209bfe64b2f32400d88898c8ee2cde213 (patch) | |
tree | 1836acb16d975eed08fe78135f6a600128993fe6 /desktop | |
parent | ed2aea97b8244dc57b3a699882ef4a6fef2600ab (diff) |
i118923 - OS/2 port: remove three layer LIBPATH layout.
Notes
Notes:
ignore: OS/2
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/os2/source/applauncher/launcher.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/desktop/os2/source/applauncher/launcher.cxx b/desktop/os2/source/applauncher/launcher.cxx index 3a41ed1f2151..bb3fe025c8cb 100644 --- a/desktop/os2/source/applauncher/launcher.cxx +++ b/desktop/os2/source/applauncher/launcher.cxx @@ -42,12 +42,7 @@ int main( int argc, char* argv[]) erridErrorCode = WinGetLastError(hab); // Calculate application name - CHAR szLibpath[_MAX_PATH*2]; CHAR szApplicationName[_MAX_PATH]; - CHAR szDrive[_MAX_PATH]; - CHAR szDir[_MAX_PATH]; - CHAR szFileName[_MAX_PATH]; - CHAR szExt[_MAX_PATH]; // get executable fullpath DosGetInfoBlocks(NULL, &pib); @@ -55,15 +50,13 @@ int main( int argc, char* argv[]) // adjust libpath #if OSL_DEBUG_LEVEL > 0 + CHAR szLibpath[_MAX_PATH*2]; 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\\"); + char* basedir = strrchr( szApplicationName, '\\'); if (basedir) *basedir = 0; - sprintf( szLibpath, "\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%%BeginLIBPATH%%;", - szDrive, szDir, szDrive, szDir); - DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH); + DosSetExtLIBPATH( (PCSZ)szApplicationName, BEGIN_LIBPATH); // make sure we load DLL from our path only, so multiple instances/versions // can be loaded. @@ -75,8 +68,7 @@ int main( int argc, char* argv[]) #endif // adjust exe name - _splitpath( szApplicationName, szDrive, szDir, szFileName, szExt ); - _makepath( szApplicationName, szDrive, szDir, OFFICE_IMAGE_NAME, (".bin") ); + strcat( szApplicationName, "\\" OFFICE_IMAGE_NAME ".bin"); // copy command line parameters int i, len; |