Skip to content

DEBUG #40887

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

Draft
YHNdnzj wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −16
Draft

DEBUG #40887

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d1690d
fd-util: modernize close_all_fds_special_case() a bit
YHNdnzj Feb 25, 2026
1fbe367
debug
YHNdnzj Mar 1, 2026
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
31 changes: 15 additions & 16 deletions src/basic/fd-util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ int close_all_fds_frugal(const int except[], size_t n_except) {
return log_debug_errno(SYNTHETIC_ERRNO(EPERM),
"Refusing to loop over %d potential fds.", max_fd);

for (int fd = 3; fd >= 0; fd = fd < max_fd ? fd + 1 : -EBADF) {
for (int fd = 3; fd <= max_fd; fd++) {
int q;

if (fd_in_set(fd, except, n_except))
Expand All @@ -286,27 +286,26 @@ static int close_all_fds_special_case(const int except[], size_t n_except) {
* nicely, since we won't need sorting for them. Returns > 0 if the special casing worked, 0
* otherwise. */

if (n_except == 1 && except[0] < 0) /* Minor optimization: if we only got one fd, and it's invalid,
* we got none */
n_except = 0;

switch (n_except) {

case 0:
/* Close everything. Yay! */
if (close_range(3, INT_MAX, 0) < 0)
return -errno;
case 1:
if (except[0] > 3 && except[0] < INT_MAX) {
/* Close all but exactly one, then we don't need no sorting. This is a pretty common
* case, hence let's handle it specially. */

return 1;
if (close_range(3, except[0] - 1, 0) < 0)
return -errno;

case 1:
/* Close all but exactly one, then we don't need no sorting. This is a pretty common
* case, hence let's handle it specially. */
if (close_range(except[0] + 1, -1, 0) < 0)
return -errno;

if (except[0] > 3 && close_range(3, except[0] - 1, 0) < 0)
return -errno;
return 1;
}

if (except[0] < INT_MAX && close_range(MAX(3, except[0] + 1), -1, 0) < 0)
_fallthrough_;
case 0:
/* Close everything. Yay! */
if (close_range(3, INT_MAX, 0) < 0)
return -errno;

return 1;
Expand Down
Loading