Chromium Code Reviews| Index: chrome/installer/util/lzma_util.cc |
| diff --git a/chrome/installer/util/lzma_util.cc b/chrome/installer/util/lzma_util.cc |
| index 8f36b5fd47f0477b440ca7ddb931fa12f3f50612..de145d9981bbb82f935a0d93be5d3b3220c22251 100644 |
| --- a/chrome/installer/util/lzma_util.cc |
| +++ b/chrome/installer/util/lzma_util.cc |
| @@ -159,22 +159,21 @@ DWORD LzmaUtil::UnPack(const std::wstring& location, |
| } |
| // Append location to the file path in archive, to get full path. |
| - std::wstring wfileName(location); |
| - file_util::AppendToPath(&wfileName, UTF8ToWide(f->Name)); |
| + FilePath file_path(location); |
| + file_path = file_path.Append(UTF8ToWide(f->Name)); |
|
Evan Martin
2011/01/07 00:16:54
Can write these lines as
FilePath file_path = Fil
tfarina
2011/01/07 00:20:25
Done.
|
| if (output_file) |
| - *output_file = wfileName; |
| + *output_file = file_path.value(); |
| // If archive entry is directory create it and move on to the next entry. |
| if (f->IsDirectory) { |
| - file_util::CreateDirectory(FilePath(wfileName)); |
| + file_util::CreateDirectory(file_path); |
| continue; |
| } |
| - HANDLE hFile; |
| - std::wstring directory = file_util::GetDirectoryFromPath(wfileName); |
| - file_util::CreateDirectory(FilePath(directory)); |
| + file_util::CreateDirectory(file_path.DirName()); |
| - hFile = CreateFile(wfileName.c_str(), GENERIC_WRITE, 0, NULL, |
| + HANDLE hFile; |
| + hFile = CreateFile(file_path.value().c_str(), GENERIC_WRITE, 0, NULL, |
| CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); |
| if (hFile == INVALID_HANDLE_VALUE) { |
| ret = GetLastError(); |