Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek shellext: handle temporary file with CAtlTemporaryFile

Changeset d074300ef351…

Parent 41ab2d81c589…

by David Golub

Changes to 3 files · Browse files at d074300ef351 Showing diff from parent 41ab2d81c589 Diff from another changeset...

Change 1 of 2 Show Entire File win32/​shellext/​RunDialog.cpp Stacked
 
98
99
100
101
102
 
 
103
104
 
105
106
107
108
109
110
111
112
113
114
115
 
116
117
118
 
129
130
131
 
 
132
133
134
135
136
 
98
99
100
 
 
101
102
103
 
104
105
106
 
 
 
 
 
 
 
 
 
107
108
109
110
 
121
122
123
124
125
126
 
127
128
129
@@ -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);
Change 1 of 1 Show Entire File win32/​shellext/​TortoiseUtils.cpp Stacked
 
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
 
72
73
74
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
75
76
77
@@ -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;
Change 1 of 1 Show Entire File win32/​shellext/​TortoiseUtils.h Stacked
 
16
17
18
19
20
21
22
 
16
17
18
 
19
20
21
@@ -16,7 +16,6 @@
 #pragma once    CString GetTHgProgRoot(); -CString GetTemporaryFile(LPCSTR strPrefix = "THG");  CString DirName(const CString& strFileName);  CString BaseName(const CString& strFileName);  bool LaunchCommand(const CString& strCommand, const CString& strCwd);