/*
- * $Id: database.c,v 1.20 2003/11/22 13:46:02 jheinonen Exp $
+ * $Id: database.c,v 1.27 2005/08/13 10:49:25 jheinonen Exp $
*
* by JH <jheinonen@users.sourceforge.net>
*
#include "misc.h"
#include "options.h"
#include "filter.h"
+#include "xmalloc.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-static void free_item(int i);
-
-
list_item *database = NULL;
int items = 0;
#define INITIAL_LIST_CAPACITY 30
-int list_capacity = 0;
+static int list_capacity = 0;
extern int first_list_item;
extern int curitem;
extern char *selected;
extern char *datafile;
-extern char *rcfile;
/*
* field definitions
{"Name", "name", TAB_CONTACT},/* NAME */
{"E-mails", "email", TAB_CONTACT},/* EMAIL */
{"Address", "address", TAB_ADDRESS},/* ADDRESS */
- {"Address2", "address2", TAB_ADDRESS},/* ADDRESS2 */
+ {"Address2", "address2", TAB_ADDRESS},/* ADDRESS2 */
{"City", "city", TAB_ADDRESS},/* CITY */
{"State/Province","state", TAB_ADDRESS},/* STATE */
{"ZIP/Postal Code","zip", TAB_ADDRESS},/* ZIP */
list_item item;
memset(&item, 0, sizeof(item));
-
+
for(;;) {
line = getaline(in);
- if( feof(in) ) {
- if( item[NAME] && sec )
+ if(feof(in)) {
+ if(item[NAME] && sec)
add_item2database(item);
else
free_list_item(item);
break;
}
- if( !*line || *line == '\n' || *line == '#' ) {
- free(line);
- continue;
- } else if( *line == '[' ) {
+ if(!*line || *line == '\n' || *line == '#') {
+ goto next;
+ } else if(*line == '[') {
if( item[NAME] && sec )
add_item2database(item);
else
free_list_item(item);
memset(&item, 0, sizeof(item));
sec = 1;
- if ( !(tmp = strchr(line, ']')))
+ if(!(tmp = strchr(line, ']')))
sec = 0; /*incorrect section lines are skipped*/
- } else if((tmp = strchr(line, '=') ) && sec ) {
+ } else if((tmp = strchr(line, '=') ) && sec) {
*tmp++ = '\0';
- for(i=0; i<ITEM_FIELDS; i++)
- if( !strcmp(abook_fields[i].key, line) ) {
- item[i] = strdup(tmp);
+ for(i = 0; i < ITEM_FIELDS; i++)
+ if(!strcmp(abook_fields[i].key, line)) {
+ item[i] = xstrdup(tmp);
goto next;
}
}
next:
- free(line);
+ xfree(line);
}
- free(line);
+ xfree(line);
return 0;
}
-
+
int
load_database(char *filename)
{
FILE *in;
- if( database != NULL )
+ if(database != NULL)
close_database();
- if ( (in = abook_fopen(filename, "r")) == NULL )
+ if ((in = abook_fopen(filename, "r")) == NULL)
return -1;
-
+
parse_database(in);
return (items == 0) ? 2 : 0;
if( (out = abook_fopen(datafile, "w")) == NULL )
return -1;
- if( list_is_empty() ) {
+ if(list_is_empty()) {
fclose(out);
unlink(datafile);
return 1;
}
-
+
write_database(out, e);
-
+
fclose(out);
-
+
return 0;
}
int i;
for(i=0; i<ITEM_FIELDS; i++)
- my_free(item[i]);
+ xfree(item[i]);
}
void
close_database()
{
int i;
-
+
for(i=0; i < items; i++)
free_item(i);
{
int i;
char *tmp;
-
+
if(item[EMAIL] == NULL)
- item[EMAIL] = strdup("");
+ item[EMAIL] = xstrdup("");
for(i=0; i<ITEM_FIELDS; i++)
if( item[i] && ((int)strlen(item[i]) > _MAX_FIELD_LEN(i) ) ) {
tmp = item[i];
item[i][_MAX_FIELD_LEN(i)-1] = 0;
- item[i] = strdup(item[i]);
+ item[i] = xstrdup(item[i]);
free(tmp);
}
}
else
return;
- database = (list_item *)abook_realloc(database,
- sizeof(list_item) * list_capacity);
- selected = (char *)abook_realloc(selected, list_capacity);
+ database = xrealloc(database, sizeof(list_item) * list_capacity);
+ selected = xrealloc(selected, list_capacity);
}
int
add_item2database(list_item item)
{
- if( item[NAME] == NULL || ! *item[NAME] ) {
+ if(item[NAME] == NULL || ! *item[NAME]) {
free_list_item(item);
return 1;
}
- if( ++items > list_capacity)
+ if(++items > list_capacity)
adjust_list_capacity();
validate_item(item);
{
int i, j;
- if( list_is_empty() )
+ if(list_is_empty())
return;
- if( ! selected_items() )
- selected[ curitem ] = 1;
-
- for( j = LAST_ITEM; j >= 0; j-- ) {
- if( selected[j] ) {
+ if(!selected_items())
+ selected[curitem] = 1;
+
+ for(j = LAST_ITEM; j >= 0; j--) {
+ if(selected[j]) {
free_item(j); /* added for .4 data_s_ */
- for( i = j; i < LAST_ITEM; i++ ) {
- itemcpy(database[ i ], database[ i + 1 ]);
- selected[ i ] = selected[ i + 1 ];
+ for(i = j; i < LAST_ITEM; i++) {
+ itemcpy(database[i], database[i + 1]);
+ selected[i] = selected[i + 1];
}
- items--;
+ items--;
}
}
- if( curitem > LAST_ITEM && items > 0 )
+ if(curitem > LAST_ITEM && items > 0)
curitem = LAST_ITEM;
-
adjust_list_capacity();
select_none();
while(p > s && *(p - 1) != ' ')
p--;
- return strdup(p);
+ return xstrdup(p);
}
static int
itemcpy(a, i1);
itemcpy(b, i2);
-
- return safe_strcoll( a[sort_field], b[sort_field] );
+
+ return safe_strcoll(a[sort_field], b[sort_field]);
}
static int
}
sort_field = field;
-
+
qsort((void *)database, items, sizeof(list_item), namecmp);
refresh_screen();
if(list_is_empty() || !is_valid_item(start))
return -2; /* error */
- findstr = strdup(str);
+ findstr = xstrdup(str);
findstr = strlower(findstr);
e.item = start - 1; /* must be "real start" - 1 */
db_enumerate_items(e) {
- for( i = 0; search_fields[i] >= 0; i++ ) {
- tmp = safe_strdup(database[e.item][search_fields[i]]);
+ for(i = 0; search_fields[i] >= 0; i++) {
+ if(database[e.item][search_fields[i]] == NULL)
+ continue;
+ tmp = xstrdup(database[e.item][search_fields[i]]);
if( tmp && strstr(strlower(tmp), findstr) ) {
ret = e.item;
goto out;
}
- my_free(tmp);
+ xfree(tmp);
}
}
{
int item = max(0, e.item + 1);
int i;
-
+
switch(e.mode) {
#ifdef DEBUG
case ENUM_ALL:
* check if we are overwriting statically allocated default
*/
if(strcasecmp(abook_fields[i].name, abook_fields[i].key))
- my_free(abook_fields[i].name);
-
- s = abook_malloc(MAX_FIELDNAME_LEN + 1);
+ xfree(abook_fields[i].name);
+
+ s = xmalloc_inc(MAX_FIELDNAME_LEN, 1);
snprintf(s, MAX_FIELDNAME_LEN, "%s", name);
abook_fields[i].name = s;
}
projects / pkg / abook.git / blobdiff