X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=edit.c;h=8f7747206d5faf9f0699208fbb76778e7e3c80ea;hb=781c0d657fffe80e45d0fda6ed5ddbf5f796fefb;hp=cb423264de2672be76fd123db6006c1e132ee2c8;hpb=8e2d9de658662d5cad666626ee507755519459d8;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index cb42326..8f77472 100644
--- a/edit.c
+++ b/edit.c
@@ -98,7 +98,7 @@ roll_emails(int item)
 
 	strcpy(database[item][EMAIL], p+1);
 	strcat(database[item][EMAIL], ",");
-	strcat(database[item][EMAIL], tmp);	
+	strcat(database[item][EMAIL], tmp);
 }
 
 static void
@@ -110,17 +110,50 @@ init_editor()
 	refresh_statusline();
 }
 
-/*
- * we have to introduce edit_undo here
- */
-static void edit_undo(int item, int mode);
-
 enum {
 	BACKUP_ITEM,
 	RESTORE_ITEM,
 	CLEAR_UNDO
 };
 
+static void
+edit_undo(int item, int mode)
+{
+	int i;
+	static list_item *backup = NULL;
+
+	switch(mode) {
+		case CLEAR_UNDO:
+			if(backup) {
+				free_list_item(backup[0]);
+				xfree(backup);
+			}
+			break;
+		case BACKUP_ITEM:
+			if(backup) {
+				free_list_item(backup[0]);
+				xfree(backup);
+			}
+			backup = xmalloc(sizeof(list_item));
+			for(i = 0; i < ITEM_FIELDS; i++)
+				if(database[item][i] == NULL)
+					backup[0][i] = NULL;
+				else
+					backup[0][i] =
+						xstrdup(database[item][i]);
+			break;
+		case RESTORE_ITEM:
+			if(backup) {
+				free_list_item(database[item]);
+				itemcpy(database[item], backup[0]);
+				xfree(backup);
+			}
+			break;
+		default:
+			assert(0);
+	}
+}
+
 
 static void
 close_editor()
@@ -247,12 +280,12 @@ change_name_field(char **field)
 {
 	char *tmp;
 
-	tmp = strdup(*field);
+	tmp = xstrdup(*field);
 	change_field("Name: ", field);
 
 	if(*field == NULL || ! **field) {
 		xfree(*field);
-		*field = strdup(tmp);
+		*field = xstrdup(tmp);
 	}
 
 	xfree(tmp);
@@ -275,7 +308,7 @@ edit_emails(char c, int item)
 	int email_num = c - '2';
 
 	split_emailstr(item, emails);
-	field = strdup(emails[email_num]);
+	field = xstrdup(emails[email_num]);
 
 	if(change_field("E-mail: ", &field))
 		return; /* user cancelled ( C-g ) */
@@ -299,7 +332,7 @@ edit_emails(char c, int item)
 	if(tmp[len -1] == ',')
 		tmp[len-1] =0;
 
-	database[item][EMAIL] = strdup(tmp);
+	database[item][EMAIL] = xstrdup(tmp);
 }
 
 static int
@@ -345,40 +378,6 @@ edit_field(int tab, char c, int item)
 	return 1;
 }
 
-static void
-edit_undo(int item, int mode)
-{
-	int i;
-	static list_item *backup = NULL;
-
-	switch(mode) {
-		case CLEAR_UNDO:
-			if(backup) {
-				free_list_item(backup[0]);
-				xfree(backup);
-			}
-			break;
-		case BACKUP_ITEM:
-			if(backup) {
-				free_list_item(backup[0]);
-				xfree(backup);
-			}
-			backup = xmalloc(sizeof(list_item));
-			for(i = 0; i < ITEM_FIELDS; i++)
-				backup[0][i] = safe_strdup(database[item][i]);
-			break;
-		case RESTORE_ITEM:
-			if(backup) {
-				free_list_item(database[item]);
-				itemcpy(database[item], backup[0]);
-				xfree(backup);
-			}
-			break;
-		default:
-			assert(0);
-	}
-}
-
 static int
 edit_loop(int item)
 {