X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=database.c;h=ab851b93ccecf43c5556ca18996b45691ac092a7;hb=47ca9ac04785f2d48d28886cbc4e2802b19dd9cf;hp=aecdf8271982151bbd926774d7a6e47e78afe01e;hpb=392a8ae6d501ab5c20b8bb8176cac4aa9dbf99f3;p=pkg%2Fabook.git

diff --git a/database.c b/database.c
index aecdf82..ab851b9 100644
--- a/database.c
+++ b/database.c
@@ -100,39 +100,38 @@ parse_database(FILE *in)
 
 	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;
 }
 
@@ -143,10 +142,10 @@ 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);
@@ -251,13 +250,13 @@ validate_item(list_item item)
 	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);
 		}
 }
@@ -282,12 +281,12 @@ adjust_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);
@@ -303,27 +302,26 @@ remove_selected_items()
 {
 	int i, j;
 
-	if( list_is_empty() )
+	if(list_is_empty())
 		return;
 
-	if( ! selected_items() )
-		selected[ curitem ] = 1;
+	if(!selected_items())
+		selected[curitem] = 1;
 
-	for( j = LAST_ITEM; j >= 0; j-- ) {
-		if( selected[j] ) {
+	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--;
 		}
 	}
 
-	if( curitem > LAST_ITEM && items > 0 )
+	if(curitem > LAST_ITEM && items > 0)
 		curitem = LAST_ITEM;
 
-
 	adjust_list_capacity();
 
 	select_none();
@@ -339,7 +337,7 @@ get_surname(char *s)
 	while(p > s && *(p - 1) != ' ')
 		p--;
 
-	return strdup(p);
+	return xstrdup(p);
 }
 
 static int
@@ -376,7 +374,7 @@ namecmp(const void *i1, const void *i2)
 	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
@@ -439,13 +437,15 @@ find_item(char *str, int start, int search_fields[])
 	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;