Fix for double line endings in messages in WWW

This commit is contained in:
Andrew Pamment 2016-08-20 14:49:37 +10:00
parent 0748b6620f
commit ef7b372567

View File

@ -545,6 +545,8 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
char *body2; char *body2;
char *tagline; char *tagline;
struct utsname name; struct utsname name;
int pos;
if (conference < 0 || conference >= conf.mail_conference_count || area < 0 || area >= conf.mail_conferences[conference]->mail_area_count) { if (conference < 0 || conference >= conf.mail_conference_count || area < 0 || area >= conf.mail_conferences[conference]->mail_area_count) {
return 0; return 0;
} }
@ -676,12 +678,10 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
} }
body2 = (char *)malloc(strlen(body) + 2 + strlen(buffer)); body2 = (char *)malloc(strlen(body) + 2 + strlen(buffer));
memset(body2, 0, strlen(body) + 2 + strlen(buffer)); memset(body2, 0, strlen(body) + 2 + strlen(buffer));
pos = 0;
for (z =0;z < strlen(body); z++) { for (z =0;z < strlen(body); z++) {
if (body[z] == '\n') { if (body[z] != '\n') {
body2[z] = '\r'; body2[pos++] = body[z];
} else {
body2[z] = body[z];
} }
} }
strcat(body2, buffer); strcat(body2, buffer);