From 73d312da38c11acb1b61d10bd2f737b7f5c7e9ae Mon Sep 17 00:00:00 2001 From: Andrew Pamment Date: Sat, 6 Aug 2016 15:03:45 +1000 Subject: [PATCH] Fix some bugs --- mail_menu.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mail_menu.c b/mail_menu.c index 7877741..f8593a2 100644 --- a/mail_menu.c +++ b/mail_menu.c @@ -705,7 +705,6 @@ void read_message(struct user_record *user, struct msg_headers *msghs, int mailn char *replybody; struct fido_addr *from_addr = NULL; int i, j; - char *dest_addr; char timestr[17]; int doquit = 0; int skip_line = 0; @@ -1366,9 +1365,17 @@ int mail_menu(struct user_record *user) { } subject = strdup(buffer); - // post a message + // post a message + if (conf.mail_conferences[user->cur_mail_conf]->realnames == 0) { + from = strdup(user->loginname); + } else { + from = (char *)malloc(strlen(user->firstname) + strlen(user->lastname) + 2); + sprintf(from, "%s %s", user->firstname, user->lastname); + } msg = external_editor(user, to, from, NULL, NULL, subject, 0); - + + free(from); + if (msg != NULL) { jb = open_jam_base(conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->path); if (!jb) { @@ -1392,7 +1399,7 @@ int mail_menu(struct user_record *user) { if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_WWIV) { sprintf(buffer, "%s #%d @%d (%s)", user->loginname, user->id, conf.mail_conferences[user->cur_mail_conf]->wwivnode, user->firstname); } else { - sprintf(from, "%s %s", user->firstname, user->lastname); + sprintf(buffer, "%s %s", user->firstname, user->lastname); } }