@@ -44,7 +44,6 @@ public:
private:
LIBCAMERA_DISABLE_COPY_AND_MOVE(Process)
- void closeAllFdsExcept(Span<const int> fds);
int isolate();
void died(int wstatus);
@@ -63,6 +63,34 @@ void sigact(int signal, siginfo_t *info, void *ucontext)
}
}
+void closeAllFdsExcept(Span<const int> fds)
+{
+ std::vector<int> v(fds.begin(), fds.end());
+ std::sort(v.begin(), v.end());
+
+ ASSERT(v.empty() || v.front() >= 0);
+
+ DIR *dir = opendir("/proc/self/fd");
+ if (!dir)
+ return;
+
+ int dfd = dirfd(dir);
+
+ struct dirent *ent;
+ while ((ent = readdir(dir)) != nullptr) {
+ char *endp;
+ int fd = strtoul(ent->d_name, &endp, 10);
+ if (*endp)
+ continue;
+
+ if (fd >= 0 && fd != dfd &&
+ !std::binary_search(v.begin(), v.end(), fd))
+ close(fd);
+ }
+
+ closedir(dir);
+}
+
} /* namespace */
void ProcessManager::sighandler()
@@ -282,34 +310,6 @@ int Process::start(const std::string &path,
}
}
-void Process::closeAllFdsExcept(Span<const int> fds)
-{
- std::vector<int> v(fds.begin(), fds.end());
- sort(v.begin(), v.end());
-
- ASSERT(v.empty() || v.front() >= 0);
-
- DIR *dir = opendir("/proc/self/fd");
- if (!dir)
- return;
-
- int dfd = dirfd(dir);
-
- struct dirent *ent;
- while ((ent = readdir(dir)) != nullptr) {
- char *endp;
- int fd = strtoul(ent->d_name, &endp, 10);
- if (*endp)
- continue;
-
- if (fd >= 0 && fd != dfd &&
- !std::binary_search(v.begin(), v.end(), fd))
- close(fd);
- }
-
- closedir(dir);
-}
-
int Process::isolate()
{
int ret = unshare(CLONE_NEWUSER | CLONE_NEWNET);
Remove `closeAllFdsExcept()` from the `Process` class and have it as a local function since it is no needed "outside" and does not depend on any part of the `Process` class. Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> --- include/libcamera/internal/process.h | 1 - src/libcamera/process.cpp | 56 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 29 deletions(-)