Skip to content

P
Postgres FD Implementation
Commit c7a1c5a6 authored by Tom Lane's avatar Tom Lane
Browse files
Options

Cosmetic improvements in new config_info code. 

Coverity griped about use of unchecked strcpy() into a local variable.
There's unlikely to be any actual bug there, since no caller would be
passing a path longer than MAXPGPATH, but nonetheless use of strlcpy()
seems preferable.

While at it, get rid of unmaintainable separation between list of
field names and list of field values in favor of initializing them
in parallel.  And we might as well declare get_configdata()'s path
argument as const char *, even though no current caller needs that.
parent 94c745eb
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 89 deletions
src/common/config_info.c
View file @ c7a1c5a6
...@@ -20,187 +20,187 @@ ...@@ -20,187 +20,187 @@
#include "postgres_fe.h" #include "postgres_fe.h"
#endif #endif
#include "miscadmin.h"
#include "common/config_info.h" #include "common/config_info.h"
#include "miscadmin.h"
static size_t configdata_names_len(void);
static const char *const configdata_names[] =
{
"BINDIR",
"DOCDIR",
"HTMLDIR",
"INCLUDEDIR",
"PKGINCLUDEDIR",
"INCLUDEDIR-SERVER",
"LIBDIR",
"PKGLIBDIR",
"LOCALEDIR",
"MANDIR",
"SHAREDIR",
"SYSCONFDIR",
"PGXS",
"CONFIGURE",
"CC",
"CPPFLAGS",
"CFLAGS",
"CFLAGS_SL",
"LDFLAGS",
"LDFLAGS_EX",
"LDFLAGS_SL",
"LIBS",
"VERSION",
NULL
};
static size_t
configdata_names_len(void)
{
size_t i = 0;
while (configdata_names[i])
i++;
return i;
}
/* /*
* get_configdata(char *my_exec_path, size_t *configdata_len) * get_configdata(const char *my_exec_path, size_t *configdata_len)
* *
* Get configure-time constants. The caller is responsible * Get configure-time constants. The caller is responsible
* for pfreeing the result. * for pfreeing the result.
*/ */
ConfigData * ConfigData *
get_configdata(char *my_exec_path, size_t *configdata_len) get_configdata(const char *my_exec_path, size_t *configdata_len)
{ {
ConfigData *configdata; ConfigData *configdata;
char path[MAXPGPATH]; char path[MAXPGPATH];
char *lastsep; char *lastsep;
int i; int i = 0;
*configdata_len = configdata_names_len(); /* Adjust this to match the number of items filled below */
configdata = palloc(*configdata_len * sizeof(ConfigData)); *configdata_len = 23;
configdata = (ConfigData *) palloc(*configdata_len * sizeof(ConfigData));
/* configdata[i].name = pstrdup("BINDIR");
* initialize configdata names strlcpy(path, my_exec_path, sizeof(path));
*
* These better be in sync with the settings manually
* defined below.
*/
for (i = 0; i < *configdata_len; i++)
configdata[i].name = pstrdup(configdata_names[i]);
strcpy(path, my_exec_path);
lastsep = strrchr(path, '/'); lastsep = strrchr(path, '/');
if (lastsep) if (lastsep)
*lastsep = '\0'; *lastsep = '\0';
cleanup_path(path); cleanup_path(path);
configdata[0].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("DOCDIR");
get_doc_path(my_exec_path, path); get_doc_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[1].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("HTMLDIR");
get_html_path(my_exec_path, path); get_html_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[2].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("INCLUDEDIR");
get_include_path(my_exec_path, path); get_include_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[3].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("PKGINCLUDEDIR");
get_pkginclude_path(my_exec_path, path); get_pkginclude_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[4].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("INCLUDEDIR-SERVER");
get_includeserver_path(my_exec_path, path); get_includeserver_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[5].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("LIBDIR");
get_lib_path(my_exec_path, path); get_lib_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[6].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("PKGLIBDIR");
get_pkglib_path(my_exec_path, path); get_pkglib_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[7].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("LOCALEDIR");
get_locale_path(my_exec_path, path); get_locale_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[8].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("MANDIR");
get_man_path(my_exec_path, path); get_man_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[9].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("SHAREDIR");
get_share_path(my_exec_path, path); get_share_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[10].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("SYSCONFDIR");
get_etc_path(my_exec_path, path); get_etc_path(my_exec_path, path);
cleanup_path(path); cleanup_path(path);
configdata[11].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("PGXS");
get_pkglib_path(my_exec_path, path); get_pkglib_path(my_exec_path, path);
strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path)); strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
cleanup_path(path); cleanup_path(path);
configdata[12].setting = pstrdup(path); configdata[i].setting = pstrdup(path);
i++;
configdata[i].name = pstrdup("CONFIGURE");
#ifdef VAL_CONFIGURE #ifdef VAL_CONFIGURE
configdata[13].setting = pstrdup(VAL_CONFIGURE); configdata[i].setting = pstrdup(VAL_CONFIGURE);
#else #else
configdata[13].setting = pstrdup(_("not recorded")); configdata[i].setting = pstrdup(_("not recorded"));
#endif #endif
i++;
configdata[i].name = pstrdup("CC");
#ifdef VAL_CC #ifdef VAL_CC
configdata[14].setting = pstrdup(VAL_CC); configdata[i].setting = pstrdup(VAL_CC);
#else #else
configdata[14].setting = pstrdup(_("not recorded")); configdata[i].setting = pstrdup(_("not recorded"));
#endif #endif
i++;
configdata[i].name = pstrdup("CPPFLAGS");
#ifdef VAL_CPPFLAGS #ifdef VAL_CPPFLAGS
configdata[15].setting = pstrdup(VAL_CPPFLAGS); configdata[i].setting = pstrdup(VAL_CPPFLAGS);
#else #else
configdata[15].setting = pstrdup(_("not recorded")); configdata[i].setting = pstrdup(_("not recorded"));
#endif #endif
i++;
configdata[i].name = pstrdup("CFLAGS");
#ifdef VAL_CFLAGS #ifdef VAL_CFLAGS
configdata[16].setting = pstrdup(VAL_CFLAGS); configdata[i].setting = pstrdup(VAL_CFLAGS);
#else #else
configdata[16].setting = pstrdup(_("not recorded")); configdata[i].setting = pstrdup(_("not recorded"));
#endif #endif
i++;
configdata[i].name = pstrdup("CFLAGS_SL");
#ifdef VAL_CFLAGS_SL #ifdef VAL_CFLAGS_SL
configdata[17].setting = pstrdup(VAL_CFLAGS_SL); configdata[i].setting = pstrdup(VAL_CFLAGS_SL);
#else #else
configdata[17].setting = pstrdup(_("not recorded")); configdata[i].setting = pstrdup(_("not recorded"));
#endif #endif
i++;
configdata[i].name = pstrdup("LDFLAGS");
#ifdef VAL_LDFLAGS #ifdef VAL_LDFLAGS
configdata[18].setting = pstrdup(VAL_LDFLAGS); configdata[i].setting = pstrdup(VAL_LDFLAGS);
#else #else
configdata[18].setting = pstrdup(_("not recorded")); configdata[i].setting = pstrdup(_("not recorded"));
#endif #endif
i++;
configdata[i].name = pstrdup("LDFLAGS_EX");
#ifdef VAL_LDFLAGS_EX #ifdef VAL_LDFLAGS_EX
configdata[19].setting = pstrdup(VAL_LDFLAGS_EX); configdata[i].setting = pstrdup(VAL_LDFLAGS_EX);
#else #else
configdata[19].setting = pstrdup(_("not recorded")); configdata[i].setting = pstrdup(_("not recorded"));
#endif #endif
i++;
configdata[i].name = pstrdup("LDFLAGS_SL");
#ifdef VAL_LDFLAGS_SL #ifdef VAL_LDFLAGS_SL
configdata[20].setting = pstrdup(VAL_LDFLAGS_SL); configdata[i].setting = pstrdup(VAL_LDFLAGS_SL);
#else #else
configdata[20].setting = pstrdup(_("not recorded")); configdata[i].setting = pstrdup(_("not recorded"));
#endif #endif
i++;
configdata[i].name = pstrdup("LIBS");
#ifdef VAL_LIBS #ifdef VAL_LIBS
configdata[21].setting = pstrdup(VAL_LIBS); configdata[i].setting = pstrdup(VAL_LIBS);
#else #else
configdata[21].setting = pstrdup(_("not recorded")); configdata[i].setting = pstrdup(_("not recorded"));
#endif #endif
i++;
configdata[i].name = pstrdup("VERSION");
configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION);
i++;
configdata[22].setting = pstrdup("PostgreSQL " PG_VERSION); Assert(i == *configdata_len);
return configdata; return configdata;
} }
src/include/common/config_info.h
View file @ c7a1c5a6
...@@ -15,7 +15,7 @@ typedef struct ConfigData ...@@ -15,7 +15,7 @@ typedef struct ConfigData
char *setting; char *setting;
} ConfigData; } ConfigData;
extern ConfigData *get_configdata(char *my_exec_path, extern ConfigData *get_configdata(const char *my_exec_path,
size_t *configdata_len); size_t *configdata_len);
#endif /* COMMON_CONFIG_INFO_H */ #endif /* COMMON_CONFIG_INFO_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment