Changeset d074300ef351…
Parent 41ab2d81c589…
by
Changes to 3 files · Browse files at d074300ef351 Showing diff from parent 41ab2d81c589 Diff from another changeset...
@@ -98,21 +98,13 @@
if (!listFiles.IsEmpty())
{
- CString strTempFile = GetTemporaryFile();
- if (strTempFile.IsEmpty())
+ CAtlTemporaryFile file;
+ if (FAILED(file.Create()))
{
- ATLTRACE("***** RunDialog: error: GetTemporaryFile returned empty string\n");
+ ATLTRACE("***** RunDialog: error: failed to create temporary file\n");
return;
}
-
- ATLTRACE("RunDialog: temp file = %s\n", (LPCTSTR)strTempFile);
- CAtlFile file;
- if (FAILED(file.Create(strTempFile, GENERIC_WRITE, FILE_SHARE_READ, CREATE_ALWAYS)))
- {
- ATLTRACE("***** RunDialog: error: failed to create file '%s'\n",
- (LPCTSTR)strTempFile);
- return;
- }
+ ATLTRACE("RunDialog: temp file = '%s'\n", file.TempFileName());
POSITION position = listFiles.GetHeadPosition();
while (position != NULL)
@@ -129,8 +121,9 @@ file.Write("\n", 1);
}
+ strHgCmd += " --listfile ";
+ strHgCmd += file.TempFileName();
file.Close();
- strHgCmd += " --listfile " + Quote(strTempFile);
}
LaunchCommand(strHgCmd, strCwd);
|
@@ -72,27 +72,6 @@ return true;
}
-CString GetTemporaryFile(LPCTSTR strPrefix)
-{
- char szTempDir[MAX_PATH + 1];
- char szTempFile[MAX_PATH + 1];
-
- if (::GetTempPath(MAX_PATH, szTempDir) == 0)
- {
- ATLTRACE("GetTemporaryFile: Failed to find temporary path\n");
- }
- else if (::GetTempFileName(szTempDir, strPrefix, 0, szTempFile) != 0)
- {
- return szTempFile;
- }
- else
- {
- ATLTRACE("GetTemporaryFile: Failed to get temporary file\n");
- }
-
- return "";
-}
-
CString DirName(const CString& strFileName)
{
if (strFileName.IsEmpty()) return strFileName;
|
Loading...