#include <hashed_db.h>
#endif
-MODULE_ID("$Id: db_iterator.c,v 1.28 2012/01/21 23:56:17 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.35 2012/08/25 21:55:00 tom Exp $")
#define HaveTicDirectory _nc_globals.have_tic_directory
#define KeepTicDirectory _nc_globals.keep_tic_directory
#define my_vars _nc_globals.dbd_vars
static void
-add_to_blob(const char *text)
+add_to_blob(const char *text, size_t limit)
{
+ (void) limit;
+
if (*text != '\0') {
char *last = my_blob + strlen(my_blob);
if (last != my_blob)
*last++ = NCURSES_PATHSEP;
- strcpy(last, text);
+ _nc_STRCPY(last, text, limit);
}
}
#if USE_HASHED_DB
else if (strlen(name) < PATH_MAX - sizeof(DBM_SUFFIX)) {
char temp[PATH_MAX];
- sprintf(temp, "%s%s", name, DBM_SUFFIX);
+ _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%s%s", name, DBM_SUFFIX);
if (stat(temp, sb) == 0 && S_ISREG(sb->st_mode)) {
result = TRUE;
}
update_getenv(const char *name, DBDIRS which)
{
bool result = FALSE;
- char *value = getenv(name);
if (which < dbdLAST) {
- if (my_vars[which].name == 0 || strcmp(my_vars[which].name, name)) {
+ char *value;
+
+ if ((value = getenv(name)) == 0 || (value = strdup(value)) == 0) {
+ ;
+ } else if (my_vars[which].name == 0 || strcmp(my_vars[which].name, name)) {
FreeIfNeeded(my_vars[which].value);
my_vars[which].name = name;
my_vars[which].value = value;
FreeIfNeeded(my_vars[which].value);
my_vars[which].value = value;
result = TRUE;
+ } else {
+ free(value);
}
}
return result;
NCURSES_EXPORT(void)
_nc_first_db(DBDIRS * state, int *offset)
{
+ bool cache_has_expired = FALSE;
*state = dbdTIC;
*offset = 0;
/* build a blob containing all of the strings we will use for a lookup
* table.
*/
- if (my_blob == 0) {
+ if (my_blob == 0 || (cache_has_expired = cache_expired())) {
size_t blobsize = 0;
const char *values[dbdLAST];
struct stat *my_stat;
int j, k;
+ if (cache_has_expired)
+ free_cache();
+
for (j = 0; j < dbdLAST; ++j)
values[j] = 0;
if (my_blob != 0) {
*my_blob = '\0';
for (j = 0; j < dbdLAST; ++j) {
- add_to_blob(values[j]);
+ add_to_blob(values[j], blobsize);
}
/* Now, build an array which will be pointers to the distinct
void
_nc_db_iterator_leaks(void)
{
+ DBDIRS which;
+
if (my_blob != 0)
FreeAndNull(my_blob);
if (my_list != 0)
FreeAndNull(my_list);
+ for (which = 0; (int) which < dbdLAST; ++which) {
+ my_vars[which].name = 0;
+ FreeIfNeeded(my_vars[which].value);
+ my_vars[which].value = 0;
+ }
}
#endif