X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=edit.c;h=4502e106191571b1a1cd3d5946d2a11b371cb967;hb=baf1c7616dd0a5fa1bafde2045ac2af22d95122a;hp=cb423264de2672be76fd123db6006c1e132ee2c8;hpb=8e2d9de658662d5cad666626ee507755519459d8;p=pkg%2Fabook.git diff --git a/edit.c b/edit.c index cb42326..4502e10 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,46 @@ 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++) + 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 void close_editor() @@ -345,40 +374,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) {