Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: content/browser/download/base_file_posix.cc

Issue 11238044: Refactor BaseFile methods to return a DownloadInterruptReason instead of a net::Error. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "content/browser/download/base_file.h"
6
7 #include "base/file_util.h"
8 #include "content/public/browser/download_interrupt_reasons.h"
9
10 content::DownloadInterruptReason BaseFile::MoveFileAndAdjustPermissions(
11 const FilePath& new_path) {
12 // Similarly, on Unix, we're moving a temp file created with permissions 600
13 // to |new_path|. Here, we try to fix up the destination file with appropriate
14 // permissions.
15 struct stat st;
16 // First check the file existence and create an empty file if it doesn't
17 // exist.
18 if (!file_util::PathExists(new_path)) {
19 int write_error = file_util::WriteFile(new_path, "", 0);
20 if (write_error < 0)
21 return LogNetError("WriteFile", net::MapSystemError(errno));
22 }
23 int stat_error = stat(new_path.value().c_str(), &st);
24 bool stat_succeeded = (stat_error == 0);
25 if (!stat_succeeded)
26 LogNetError("stat", net::MapSystemError(errno));
Randy Smith (Not in Mondays) 2012/10/23 20:18:13 Why not logging the OS error directly here? Given
asanka 2012/10/23 21:53:34 We are logging the OS error as well now, although
27
28 // TODO(estade): Move() falls back to copying and deleting when a simple
29 // rename fails. Copying sucks for large downloads. crbug.com/8737
30 if (!file_util::Move(full_path_, new_path))
31 return LogNetError("Move", net::MapSystemError(errno));
32
33 if (stat_succeeded) {
34 // On Windows file systems (FAT, NTFS), chmod fails. This is OK.
35 int chmod_error = chmod(new_path.value().c_str(), st.st_mode);
36 if (chmod_error < 0)
37 LogNetError("chmod", net::MapSystemError(errno));
38 }
39 return content::DOWNLOAD_INTERRUPT_REASON_NONE;
40 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698