Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#190492

Browse Source 
r=pedemont, sr=blizzard for platform specific code, a=asa
OS/2 only - remove backslash before calling FileExists so it correctly finds the directory
This commit is contained in:
mkaply%us.ibm.com 2003-01-25 21:36:30 +00:00
parent 8423ead416
commit 61612bbbab
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xpinstall/wizard/os2/setup/extra.c
View File

@ -425,14 +425,15 @@ HRESULT Initialize(HMODULE hInstance, PSZ szAppName)
{
char szECreateTempDir[MAX_BUF];
if(GetPrivateProfileString("Messages", "ERROR_CREATE_TEMP_DIR", "", szECreateTempDir, sizeof(szECreateTempDir), szFileIniInstall))
if(GetPrivateProfileString("Messages", "ERROR_CREATE_TEMP_DIR", "",
szECreateTempDir, sizeof(szECreateTempDir),
szFileIniInstall))
{
sprintf(szBuf, szECreateTempDir, szTempDir);
PrintError(szBuf, ERROR_CODE_HIDE);
}
return(1);
}
RemoveBackSlash(szTempDir);
}
DeleteIdiGetConfigIni();

10
xpinstall/wizard/os2/uninstall/extra.c
View File

@ -201,13 +201,13 @@ HRESULT Initialize(HMODULE hInstance, PSZ szAppName)
// determine the system's TEMP path
tempEnvVar = getenv("TMP");
if ((tempEnvVar) && (!(isFAT(tempEnvVar)))) {
strcpy(szOSTempDir, tempEnvVar);
strcpy(szTempDir, tempEnvVar);
}
else
{
tempEnvVar = getenv("TEMP");
if (tempEnvVar)
strcpy(szOSTempDir, tempEnvVar);
strcpy(szTempDir, tempEnvVar);
}
if ((!tempEnvVar) || (isFAT(tempEnvVar)))
{
@ -242,8 +242,8 @@ HRESULT Initialize(HMODULE hInstance, PSZ szAppName)
}
}
}
strcpy(szOSTempDir, buffer);
strcat(szOSTempDir, "TEMP");
strcpy(szTempDir, buffer);
strcat(szTempDir, "TEMP");
}
strcpy(szOSTempDir, szTempDir);
AppendBackSlash(szTempDir, MAX_BUF);
@ -253,6 +253,7 @@ HRESULT Initialize(HMODULE hInstance, PSZ szAppName)
{
AppendBackSlash(szTempDir, MAX_BUF);
CreateDirectoriesAll(szTempDir);
RemoveBackSlash(szTempDir);
if(!FileExists(szTempDir))
{
char szECreateTempDir[MAX_BUF];
@ -266,7 +267,6 @@ HRESULT Initialize(HMODULE hInstance, PSZ szAppName)
}
return(1);
}
RemoveBackSlash(szTempDir);
}
ugUninstall.bVerbose = FALSE;