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

Side by Side Diff: third_party/crashpad/crashpad/util/posix/close_multiple.cc

Issue 1911823002: Convert //third_party from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update crashpad's README.chromium Created 4 years, 8 months 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
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "util/posix/close_multiple.h" 15 #include "util/posix/close_multiple.h"
16 16
17 #include <dirent.h> 17 #include <dirent.h>
18 #include <errno.h> 18 #include <errno.h>
19 #include <fcntl.h> 19 #include <fcntl.h>
20 #include <limits.h> 20 #include <limits.h>
21 #include <stdlib.h> 21 #include <stdlib.h>
22 #include <string.h> 22 #include <string.h>
23 #include <unistd.h> 23 #include <unistd.h>
24 24
25 #include <algorithm> 25 #include <algorithm>
26 #include <memory>
26 27
27 #include "base/logging.h" 28 #include "base/logging.h"
28 #include "base/memory/scoped_ptr.h"
29 #include "base/posix/eintr_wrapper.h" 29 #include "base/posix/eintr_wrapper.h"
30 #include "build/build_config.h" 30 #include "build/build_config.h"
31 #include "util/misc/implicit_cast.h" 31 #include "util/misc/implicit_cast.h"
32 #include "util/numeric/safe_assignment.h" 32 #include "util/numeric/safe_assignment.h"
33 33
34 // Everything in this file is expected to execute between fork() and exec(), 34 // Everything in this file is expected to execute between fork() and exec(),
35 // so everything called here must be acceptable in this context. However, 35 // so everything called here must be acceptable in this context. However,
36 // logging code that is not expected to execute under normal circumstances is 36 // logging code that is not expected to execute under normal circumstances is
37 // currently permitted. 37 // currently permitted.
38 38
(...skipping 27 matching lines...) Expand all
66 struct ScopedDIRCloser { 66 struct ScopedDIRCloser {
67 void operator()(DIR* dir) const { 67 void operator()(DIR* dir) const {
68 if (dir) { 68 if (dir) {
69 if (closedir(dir) < 0) { 69 if (closedir(dir) < 0) {
70 PLOG(ERROR) << "closedir"; 70 PLOG(ERROR) << "closedir";
71 } 71 }
72 } 72 }
73 } 73 }
74 }; 74 };
75 75
76 using ScopedDIR = scoped_ptr<DIR, ScopedDIRCloser>; 76 using ScopedDIR = std::unique_ptr<DIR, ScopedDIRCloser>;
77 77
78 // This function implements CloseMultipleNowOrOnExec() using an operating 78 // This function implements CloseMultipleNowOrOnExec() using an operating
79 // system-specific FD directory to determine which file descriptors are open. 79 // system-specific FD directory to determine which file descriptors are open.
80 // This is an advantage over looping over all possible file descriptors, because 80 // This is an advantage over looping over all possible file descriptors, because
81 // no attempt needs to be made to close file descriptors that are not open. 81 // no attempt needs to be made to close file descriptors that are not open.
82 bool CloseMultipleNowOrOnExecUsingFDDir(int fd, int preserve_fd) { 82 bool CloseMultipleNowOrOnExecUsingFDDir(int fd, int preserve_fd) {
83 #if defined(OS_MACOSX) 83 #if defined(OS_MACOSX)
84 const char kFDDir[] = "/dev/fd"; 84 const char kFDDir[] = "/dev/fd";
85 #elif defined(OS_LINUX) 85 #elif defined(OS_LINUX)
86 const char kFDDir[] = "/proc/self/fd"; 86 const char kFDDir[] = "/proc/self/fd";
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 max_fd = std::max(max_fd, getdtablesize()); 149 max_fd = std::max(max_fd, getdtablesize());
150 150
151 for (int entry_fd = fd; entry_fd < max_fd; ++entry_fd) { 151 for (int entry_fd = fd; entry_fd < max_fd; ++entry_fd) {
152 if (entry_fd != preserve_fd) { 152 if (entry_fd != preserve_fd) {
153 CloseNowOrOnExec(entry_fd, true); 153 CloseNowOrOnExec(entry_fd, true);
154 } 154 }
155 } 155 }
156 } 156 }
157 157
158 } // namespace crashpad 158 } // namespace crashpad
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698