TIC file attach netmail subject lines shortened

This commit is contained in:
Michiel Broek 2002-04-02 20:50:13 +00:00
parent b9aefca9bf
commit 4d543c8de6
2 changed files with 17 additions and 12 deletions

View File

@ -4694,6 +4694,8 @@ v0.33.20 10-Feb-2002
For points in echomail no seen-by entry is added. For points in echomail no seen-by entry is added.
The AreaMgr and FileMgr responses and notify messages now use The AreaMgr and FileMgr responses and notify messages now use
the diesel macro language. the diesel macro language.
The tic file forward function now uses only filenames in the
subject of the netmail messages without the path.
mball: mball:
Will not crash anymore when it needs more then 10 minutes to Will not crash anymore when it needs more then 10 minutes to

View File

@ -47,7 +47,7 @@
void ForwardFile(fidoaddr Node, fa_list *sbl) void ForwardFile(fidoaddr Node, fa_list *sbl)
{ {
char *subject = NULL, *temp, *fwdfile = NULL, *ticfile = NULL, fname[PATH_MAX]; char *subject = NULL, *temp, *fwdfile = NULL, *ticfile = NULL, fname[PATH_MAX], *ticname;
FILE *fp, *net; FILE *fp, *net;
char flavor; char flavor;
faddr *dest, *route, *Fa; faddr *dest, *route, *Fa;
@ -93,10 +93,13 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
/* /*
* Create the full filename * Create the full filename
*/ */
if (TIC.SendOrg) if (TIC.SendOrg) {
sprintf(fwdfile, "%s/%s", TIC.Inbound, TIC.RealName); sprintf(fwdfile, "%s/%s", TIC.Inbound, TIC.RealName);
else subject = xstrcpy(TIC.RealName);
} else {
sprintf(fwdfile, "%s/%s", TIC.BBSpath, TIC.NewName); sprintf(fwdfile, "%s/%s", TIC.BBSpath, TIC.NewName);
subject = xstrcpy(TIC.NewName);
}
flavor = 'f'; flavor = 'f';
if (nodes.Crash) if (nodes.Crash)
@ -111,20 +114,20 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
dest = fido2faddr(Node); dest = fido2faddr(Node);
attach(*route, fwdfile, LEAVE, flavor); attach(*route, fwdfile, LEAVE, flavor);
if (strlen(CFG.dospath)) // if (strlen(CFG.dospath))
subject = xstrcpy(Unix2Dos(fwdfile)); // subject = xstrcpy(Unix2Dos(fwdfile));
else // else
subject = xstrcpy(fwdfile); // subject = xstrcpy(fwdfile);
ticfile = calloc(PATH_MAX, sizeof(char)); ticfile = calloc(PATH_MAX, sizeof(char));
ticname = calloc(15, sizeof(char));
if (nodes.Tic) { if (nodes.Tic) {
sprintf(ticfile, "%s/%08lx.tic", CFG.ticout, sequencer()); sprintf(ticname, "%08lx.tic", sequencer());
subject = xstrcat(subject, (char *)" "); subject = xstrcat(subject, (char *)" ");
if (strlen(CFG.dospath)) subject = xstrcat(subject, ticname);
subject = xstrcat(subject, Unix2Dos(ticfile)); sprintf(ticfile, "%s/%s", CFG.ticout, ticname);
else
subject = xstrcat(subject, ticfile);
} }
free(ticname);
/* /*
* Send netmail message if the node has it turned on. * Send netmail message if the node has it turned on.