From ecd7a3a991c0f02ea7bc8ff07b1ab29d010647b6 Mon Sep 17 00:00:00 2001
From: "mkaply%us.ibm.com"
 <mkaply%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 25 Jan 2003 21:36:30 +0000
Subject: [PATCH] #190492 r=pedemont, sr=blizzard for platform specific code,
 a=asa OS/2 only - remove backslash before calling FileExists so it correctly
 finds the directory

git-svn-id: svn://10.0.0.236/trunk@136961 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpinstall/wizard/os2/setup/extra.c     |  5 +++--
 mozilla/xpinstall/wizard/os2/uninstall/extra.c | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mozilla/xpinstall/wizard/os2/setup/extra.c b/mozilla/xpinstall/wizard/os2/setup/extra.c
index e085bf420cf..65d4d693d20 100644
--- a/mozilla/xpinstall/wizard/os2/setup/extra.c
+++ b/mozilla/xpinstall/wizard/os2/setup/extra.c
@@ -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();
diff --git a/mozilla/xpinstall/wizard/os2/uninstall/extra.c b/mozilla/xpinstall/wizard/os2/uninstall/extra.c
index fec9dd5b7c0..41a37bcbddb 100644
--- a/mozilla/xpinstall/wizard/os2/uninstall/extra.c
+++ b/mozilla/xpinstall/wizard/os2/uninstall/extra.c
@@ -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;