Skip to content

initdb: reset and preserve errno when scanning cdb_init.d #1589

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

Open
tuhaihe wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −4
Open

initdb: reset and preserve errno when scanning cdb_init.d #1589

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9a4bb9
initdb: reset and preserve errno when scanning cdb_init.d
tuhaihe Feb 28, 2026
f91837b
Address the comment
tuhaihe Mar 2, 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
13 changes: 9 additions & 4 deletions src/bin/initdb/initdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2024,6 +2024,7 @@ setup_cdb_schema(FILE *cmdfd)

/* Collect all files with .sql suffix in array. */
nscripts = 0;
errno = 0;
while ((file = readdir(dir)) != NULL)
{
int namelen = strlen(file->d_name);
Expand Down Expand Up @@ -2054,12 +2055,16 @@ setup_cdb_schema(FILE *cmdfd)
errno = 0;
#endif

closedir(dir);

if (errno != 0)
if (errno)
{
/* some kind of I/O error? */
pg_log_error("error while reading cdb_init.d directory: %m");
closedir(dir);
exit(1);
}

if (closedir(dir))
{
pg_log_error("error while closing cdb_init.d directory: %m");
Comment on lines +2065 to +2067
Copy link
Contributor

@avamingli avamingli Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

closedir() rarely fails in practice — we have plenty of code that doesn't check its return value — but it's fine to keep the check here, no objection.

exit(1);
}

Expand Down
Loading