bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved the TID to the top

Browse Source
This commit is contained in:
Michiel Broek 2002-11-12 20:29:47 +00:00
parent a81d334783
commit e6b934721f
2 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -95,6 +95,8 @@ v0.35.05 19-Oct-2002
before the archiver is called to reuse that filename again. before the archiver is called to reuse that filename again.
When mail/files were moved to the inbound from a directory When mail/files were moved to the inbound from a directory
node, this was not processed in the same session. node, this was not processed in the same session.
Moved the ^aTID kludge to the top of the exported message
after the last kludge so people won't complain anymore.
mbtask: mbtask:
Removed debug logging of "does" info. Removed debug logging of "does" info.

37
mbfido/scan.c
View File

@ -574,7 +574,7 @@ int RescanOne(faddr *L, char *marea, unsigned long Num)
*/ */
void ExportEcho(sysconnect L, unsigned long MsgNum, fa_list **sbl) void ExportEcho(sysconnect L, unsigned long MsgNum, fa_list **sbl)
{ {
int seenlen, oldnet, flags = 0, is_pid = FALSE; int seenlen, oldnet, flags = 0, kludges = TRUE;
char *p, sbe[16], ext[4]; char *p, sbe[16], ext[4];
fa_list *tmpl; fa_list *tmpl;
FILE *qp; FILE *qp;
@ -621,11 +621,11 @@ void ExportEcho(sysconnect L, unsigned long MsgNum, fa_list **sbl)
if (Msg_Read(MsgNum, 78)) { if (Msg_Read(MsgNum, 78)) {
if ((p = (char *)MsgText_First()) != NULL) { if ((p = (char *)MsgText_First()) != NULL) {
do { do {
if ((strncmp(p, " * Origin:", 10) == 0) && !is_pid) { if (kludges && (p[0] != '\001')) {
/* /*
* If there was no PID kludge, insert the TID * At the end of the kludges, add the TID kludge.
* kludge anyway.
*/ */
kludges = FALSE;
fprintf(qp, "\001TID: MBSE-FIDO %s\r", VERSION); fprintf(qp, "\001TID: MBSE-FIDO %s\r", VERSION);
} }
fprintf(qp, "%s", p); fprintf(qp, "%s", p);
@ -636,15 +636,6 @@ void ExportEcho(sysconnect L, unsigned long MsgNum, fa_list **sbl)
* Only append CR if not the last line * Only append CR if not the last line
*/ */
fprintf(qp, "\r"); fprintf(qp, "\r");
/*
* Append ^aTID line behind the PID.
*/
if (strncmp(p, "\001PID", 4) == 0) {
fprintf(qp, "\001TID: MBSE-FIDO %s\r", VERSION);
is_pid = TRUE;
}
} while ((p = (char *)MsgText_Next()) != NULL); } while ((p = (char *)MsgText_Next()) != NULL);
} }
} }
@ -689,7 +680,7 @@ void ExportNews(unsigned long MsgNum, fa_list **sbl)
fa_list *tmpl; fa_list *tmpl;
FILE *qp; FILE *qp;
faddr *from, *dest; faddr *from, *dest;
int is_pid = FALSE, kludges = TRUE; int kludges = TRUE;
qp = tmpfile(); qp = tmpfile();
@ -720,6 +711,7 @@ void ExportNews(unsigned long MsgNum, fa_list **sbl)
* After the first kludges, send RFC headers * After the first kludges, send RFC headers
*/ */
kludges = FALSE; kludges = FALSE;
fprintf(qp, "\001TID: MBSE-FIDO %s\n", VERSION);
fprintf(qp, "Subject: %s\n", Msg.Subject); fprintf(qp, "Subject: %s\n", Msg.Subject);
Syslog('m', "Subject: %s", Msg.Subject); Syslog('m', "Subject: %s", Msg.Subject);
fprintf(qp, "\n"); fprintf(qp, "\n");
@ -731,14 +723,6 @@ void ExportNews(unsigned long MsgNum, fa_list **sbl)
Syslog('m', "%s", p+1); Syslog('m', "%s", p+1);
} }
} else { } else {
if ((strncmp(p, " * Origin:", 10) == 0) && !is_pid) {
/*
* If there was no PID kludge, insert the TID
* kludge anyway.
*/
fprintf(qp, "\001TID: MBSE-FIDO %s\n", VERSION);
Syslog('m', "\\001TID: MBSE-FIDO %s", VERSION);
}
fprintf(qp, "%s", p); fprintf(qp, "%s", p);
Syslog('m', "%s", printable(p, 0)); Syslog('m', "%s", printable(p, 0));
if (strncmp(p, " * Origin:", 10) == 0) if (strncmp(p, " * Origin:", 10) == 0)
@ -748,15 +732,6 @@ void ExportNews(unsigned long MsgNum, fa_list **sbl)
* Only append NL if not the last line * Only append NL if not the last line
*/ */
fprintf(qp, "\n"); fprintf(qp, "\n");
/*
* Append ^aTID line
*/
if (strncmp(p, "\001PID", 4) == 0) {
fprintf(qp, "\001TID: MBSE-FIDO %s\n", VERSION);
Syslog('m', "\\001TID: MBSE-FIDO %s", VERSION);
is_pid = TRUE;
}
} }
} while ((p = (char *)MsgText_Next()) != NULL); } while ((p = (char *)MsgText_Next()) != NULL);
} }