X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;ds=sidebyside;f=edit.c;h=643603245b7958cb0198ae44d3ced8e72e949778;hb=733d10d283b596a5adac07f42f15c73431b85a41;hp=e41d707d1d5d22e6f87a75cbdd4a80031d541635;hpb=3a500c48898f7a279a98bfc259955a2e47bbfc48;p=pkg%2Fabook.git diff --git a/edit.c b/edit.c index e41d707..6436032 100644 --- a/edit.c +++ b/edit.c @@ -127,12 +127,12 @@ print_editor_header(int item) get_first_email(email, item); - if( snprintf(header, EDITW_COLS, "%s <%s>", database[item][NAME], - email ) == -1 || !*database[item][EMAIL] ) - if( snprintf(header, EDITW_COLS, "%s", database[item][NAME]) == -1) { - free(header); - return; - } + if( *database[item][EMAIL] ) + snprintf(header, EDITW_COLS, "%s <%s>", + database[item][NAME], + database[item][EMAIL]); + else + snprintf(header, EDITW_COLS, "%s", database[item][NAME]); len = strlen(header); x = (EDITW_COLS - len) / 2; @@ -381,8 +381,8 @@ edit_loop(int item) case 'r': roll_emails(item); break; case '?': display_help(HELP_EDITOR); break; case 'u': edit_undo(item, RESTORE_ITEM); break; - case 'm': launch_mutt(item); - case 'v': launch_wwwbrowser(item); + case 'm': launch_mutt(item); clearok(stdscr, 1); break; + case 'v': launch_wwwbrowser(item); clearok(stdscr, 1); break; case 12 : clearok(stdscr, 1); break; /* ^L (refresh screen) */ default: return edit_field(tab, c, item) ? item : -1; }