Skip to content

Use /proc/self instead of /proc/<pid> in getOpenedPath #1322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ptarjan wants to merge 1 commit into from
+2 −13
Closed

Use /proc/self instead of /proc/<pid> in getOpenedPath #1322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions watchman/fs/FileDescriptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

#include "watchman/fs/FileDescriptor.h"
#include <folly/String.h>
#include <folly/system/Pid.h>
#include <system_error>
#include "watchman/fs/FSDetect.h"
#include "watchman/fs/FileInformation.h"
Expand Down Expand Up @@ -228,19 +227,9 @@ w_string FileDescriptor::getOpenedPath() const {
#elif defined(__linux__) || defined(__sun)
char procpath[1024];
#if defined(__linux__)
snprintf(
procpath,
sizeof(procpath),
"/proc/%d/fd/%d",
folly::get_cached_pid(),
fd_);
snprintf(procpath, sizeof(procpath), "/proc/self/fd/%d", fd_);
#elif defined(__sun)
snprintf(
procpath,
sizeof(procpath),
"/proc/%d/path/%d",
folly::get_cached_pid(),
fd_);
snprintf(procpath, sizeof(procpath), "/proc/self/path/%d", fd_);
#endif

// Avoid an extra stat by speculatively attempting to read into
Expand Down
Loading