database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-24 00:23:06 +03:00
Code Activity

Refactor code checking for file existence

Browse Source 
jit.c and dfgr.c had a copy of the same code to check if a file exists
or not, with a twist: jit.c did not check for EACCES when failing the
stat() call for the path whose existence is tested.  This refactored
routine will be used by an upcoming patch.

Reviewed-by: Ashutosh Bapat
Discussion: https://postgr.es/m/ZTiV8tn_MIb_H2rE@paquier.xyz
This commit is contained in:
Michael Paquier
2024-01-12 12:04:51 +09:00
parent 08c3ad27eb
commit e72a37528d
4 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/utils/fmgr/dfmgr.c
View File

@@ -33,6 +33,7 @@
#include "fmgr.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
#include "storage/fd.h"
#include "storage/shmem.h"
#include "utils/hsearch.h"
@@ -78,7 +79,6 @@ char *Dynamic_library_path;
static void *internal_load_library(const char *libname);
static void incompatible_module_error(const char *libname,
const Pg_magic_struct *module_magic_data) pg_attribute_noreturn();
static bool file_exists(const char *name);
static char *expand_dynamic_library_name(const char *name);
static void check_restricted_library_name(const char *name);
static char *substitute_libpath_macro(const char *name);
@@ -400,23 +400,6 @@ incompatible_module_error(const char *libname,
errdetail_internal("%s", details.data)));
}
static bool
file_exists(const char *name)
{
struct stat st;
Assert(name != NULL);
if (stat(name, &st) == 0)
return !S_ISDIR(st.st_mode);
else if (!(errno == ENOENT || errno == ENOTDIR || errno == EACCES))
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not access file \"%s\": %m", name)));
return false;
}
/*
* If name contains a slash, check if the file exists, if so return
@@ -447,7 +430,7 @@ expand_dynamic_library_name(const char *name)
else
{
full = substitute_libpath_macro(name);
if (file_exists(full))
if (pg_file_exists(full))
return full;
pfree(full);
}
@@ -465,7 +448,7 @@ expand_dynamic_library_name(const char *name)
{
full = substitute_libpath_macro(new);
pfree(new);
if (file_exists(full))
if (pg_file_exists(full))
return full;
pfree(full);
}
@@ -582,7 +565,7 @@ find_in_dynamic_libpath(const char *basename)
elog(DEBUG3, "find_in_dynamic_libpath: trying \"%s\"", full);
if (file_exists(full))
if (pg_file_exists(full))
return full;
pfree(full);