Skip to content

Simplify code using absl::Cleanup #1555

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

Merged
merged 1 commit into from
Oct 30, 2025
Merged

Simplify code using absl::Cleanup #1555

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
12 changes: 5 additions & 7 deletions elisp/private/tools/system.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,19 +493,17 @@ absl::StatusOr<NativeString> ToNative(

#ifndef _WIN32
static absl::StatusOr<FileName> WorkingDirectory() {
struct Free {
void operator()(char* const absl_nonnull p) const { std::free(p); }
};
// Assume that we always run on an OS that allocates a buffer when passed a
// null pointer.
const absl_nullable std::unique_ptr<char, Free> ptr(getcwd(nullptr, 0));
char* const absl_nullable ptr = getcwd(nullptr, 0);
if (ptr == nullptr) return ErrnoStatus("getcwd", nullptr, 0);
const absl::Cleanup cleanup = [ptr] { std::free(ptr); };
// See the Linux man page for getcwd(3) why this can happen.
if (*ptr != '/') {
return absl::NotFoundError(absl::StrCat("Current working directory ",
ptr.get(), " is unreachable"));
return absl::NotFoundError(
absl::StrFormat("Current working directory %s is unreachable", ptr));
}
return FileName::FromString(ptr.get());
return FileName::FromString(ptr);
}
#endif

Expand Down