modify to and subject on reply

This commit is contained in:
Andrew Pamment
2018-05-09 13:19:49 +10:00
parent 94a273038a
commit 8c9111fa17
3 changed files with 18 additions and 21 deletions

View File

@@ -1700,23 +1700,14 @@ int read_message(struct user_record *user, struct msg_headers *msghs, int mailno
subject = (char *)malloc(strlen(buffer) + 1);
strcpy(subject, buffer);
s_printf(get_string(114), subject);
s_printf(get_string(114));
s_readstring_inject(buffer, 32, msghs->msgs[mailno]->from);
to = strdup(buffer);
s_printf(get_string(115));
s_readstring_inject(buffer, 64, subject);
free(subject);
subject = strdup(buffer);
c = s_getc();
if (tolower(c) == 'y') {
s_printf(get_string(116));
s_readstring(buffer, 25);
if (strlen(buffer) == 0) {
s_printf(get_string(117));
} else {
free(subject);
subject = (char *)malloc(strlen(buffer) + 1);
strcpy(subject, buffer);
}
}
s_printf("\r\n");
if (msghs->msgs[mailno]->from != NULL) {
@@ -1730,11 +1721,9 @@ int read_message(struct user_record *user, struct msg_headers *msghs, int mailno
sprintf(from, "%s %s", user->firstname, user->lastname);
}
if (conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_NEWSGROUP_AREA) {
free(to);
to = (char *)malloc(4);
strcpy(to, "ALL");
} else {
to = (char *)malloc(strlen(buffer) + 1);
strcpy(to, buffer);
}
replybody = external_editor(user, to, from, body, z2, msghs->msgs[mailno]->from, subject, 0, 0);
if (replybody != NULL) {
@@ -2128,7 +2117,7 @@ void post_message(struct user_record *user) {
sprintf(buffer, "ALL");
} else {
s_printf(get_string(54));
s_readstring(buffer, 16);
s_readstring(buffer, 32);
}
if (strlen(buffer) == 0) {
strcpy(buffer, "ALL");