mirror of
https://github.com/postgres/postgres.git
synced 2025-12-18 05:01:01 +03:00
319406c2ac
Avoid losing errno if readdir() fails and closedir() works. This also
avoids leaking the directory handle when readdir() fails. Commit
6f03927fce introduced logic to better
handle readdir() and closedir() failures, bu it missed these cases.
Extracted from a larger patch by Marco Nenciarini.
74 lines
1.6 KiB
C
74 lines
1.6 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* src/port/pgcheckdir.c
|
|
*
|
|
* A simple subroutine to check whether a directory exists and is empty or not.
|
|
* Useful in both initdb and the backend.
|
|
*
|
|
* Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#include "c.h"
|
|
|
|
#include <dirent.h>
|
|
|
|
|
|
/*
|
|
* Test to see if a directory exists and is empty or not.
|
|
*
|
|
* Returns:
|
|
* 0 if nonexistent
|
|
* 1 if exists and empty
|
|
* 2 if exists and not empty
|
|
* -1 if trouble accessing directory (errno reflects the error)
|
|
*/
|
|
int
|
|
pg_check_dir(const char *dir)
|
|
{
|
|
int result = 1;
|
|
DIR *chkdir;
|
|
struct dirent *file;
|
|
int readdir_errno;
|
|
|
|
chkdir = opendir(dir);
|
|
|
|
if (chkdir == NULL)
|
|
return (errno == ENOENT) ? 0 : -1;
|
|
|
|
while (errno = 0, (file = readdir(chkdir)) != NULL)
|
|
{
|
|
if (strcmp(".", file->d_name) == 0 ||
|
|
strcmp("..", file->d_name) == 0)
|
|
{
|
|
/* skip this and parent directory */
|
|
continue;
|
|
}
|
|
else
|
|
{
|
|
result = 2; /* not empty */
|
|
break;
|
|
}
|
|
}
|
|
|
|
#ifdef WIN32
|
|
/* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */
|
|
if (GetLastError() == ERROR_NO_MORE_FILES)
|
|
errno = 0;
|
|
#endif
|
|
|
|
if (errno)
|
|
result = -1; /* some kind of I/O error? */
|
|
|
|
/* Close chkdir and avoid overwriting the readdir errno on success */
|
|
readdir_errno = errno;
|
|
if (closedir(chkdir))
|
|
result = -1; /* error executing closedir */
|
|
else
|
|
errno = readdir_errno;
|
|
|
|
return result;
|
|
}
|