Changed to use direct instead of immediate mail.

This commit is contained in:
Michiel Broek 2004-07-12 20:00:52 +00:00
parent 7a147613e3
commit 8dcb98e8fa
5 changed files with 18 additions and 4 deletions

View File

@ -14,6 +14,12 @@ v0.61.2 11-Jul-2004
with other mailers. Russell??
If you only use mbcico there will be no problems.
mbout:
Changed to use direct instead of immediate mail.
mbtask:
Changed to use direct instead of immediate mail.
v0.61.1 20-Jun-2004 - 11-Jul-2004

View File

@ -357,7 +357,7 @@ int each(faddr *addr, char flavor, int isflo, char *fname)
if ((isflo == OUT_FLO) || (isflo == OUT_PKT))
switch (flavor) {
case '?': break;
case 'i': (*tmp)->flavors |= F_IMM; break;
case 'd': (*tmp)->flavors |= F_IMM; break;
case 'o': (*tmp)->flavors |= F_NORMAL; break;
case 'c': (*tmp)->flavors |= F_CRASH; break;
case 'h': (*tmp)->flavors |= F_HOLD; break;

View File

@ -87,6 +87,7 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo
(strcasecmp(de->d_name+8,".cut") == 0) ||
(strcasecmp(de->d_name+8,".hut") == 0) ||
(strcasecmp(de->d_name+8,".iut") == 0) ||
(strcasecmp(de->d_name+8,".dut") == 0) ||
(strcasecmp(de->d_name+8,".opk") == 0) ||
(strcasecmp(de->d_name+8,".cpk") == 0) ||
(strcasecmp(de->d_name+8,".hpk") == 0) ||
@ -95,6 +96,7 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo
(strcasecmp(de->d_name+8,".clo") == 0) ||
(strcasecmp(de->d_name+8,".hlo") == 0) ||
(strcasecmp(de->d_name+8,".ilo") == 0) ||
(strcasecmp(de->d_name+8,".dlo") == 0) ||
(strcasecmp(de->d_name+8,".req") == 0) ||
(strcasecmp(de->d_name+8,".pol") == 0)) {
if (ispoint)
@ -103,7 +105,9 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo
sscanf(de->d_name,"%04x%04x", &addr.net,&addr.node);
flavor = tolower(de->d_name[9]);
if (flavor == 'f')
flavor='o';
flavor = 'o';
if (flavor == 'i')
flavor = 'd';
if (strcasecmp(de->d_name+10,"ut") == 0)
isflo=OUT_PKT;
else if (strcasecmp(de->d_name+10,"pk") == 0)

View File

@ -542,7 +542,7 @@ int outstat()
* Immediate Mail check
*/
if ((tmp->flavors) & F_IMM) {
flstr[0]='I';
flstr[0]='D';
/*
* Immediate mail, send if node is CM or is in a Txx window or is in ZMH.
*/
@ -791,7 +791,7 @@ int each(faddr *addr, char flavor, int isflo, char *fname)
if ((isflo == OUT_FLO) || (isflo == OUT_PKT) || (isflo == OUT_FIL))
switch (flavor) {
case '?': break;
case 'i': (*tmp)->flavors |= F_IMM; break;
case 'd': (*tmp)->flavors |= F_IMM; break;
case 'o': (*tmp)->flavors |= F_NORMAL; break;
case 'c': (*tmp)->flavors |= F_CRASH; break;
case 'h': (*tmp)->flavors |= F_HOLD; break;

View File

@ -90,6 +90,7 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo
(strcasecmp(de->d_name+8,".cut") == 0) ||
(strcasecmp(de->d_name+8,".hut") == 0) ||
(strcasecmp(de->d_name+8,".iut") == 0) ||
(strcasecmp(de->d_name+8,".dut") == 0) ||
(strcasecmp(de->d_name+8,".opk") == 0) ||
(strcasecmp(de->d_name+8,".cpk") == 0) ||
(strcasecmp(de->d_name+8,".hpk") == 0) ||
@ -98,6 +99,7 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo
(strcasecmp(de->d_name+8,".clo") == 0) ||
(strcasecmp(de->d_name+8,".hlo") == 0) ||
(strcasecmp(de->d_name+8,".ilo") == 0) ||
(strcasecmp(de->d_name+8,".dlo") == 0) ||
(strcasecmp(de->d_name+8,".req") == 0) ||
(strcasecmp(de->d_name+8,".pol") == 0)) {
if (ispoint)
@ -107,6 +109,8 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo
flavor = tolower(de->d_name[9]);
if (flavor == 'f')
flavor='o';
if (flavor == 'i')
flavor='d';
if (strcasecmp(de->d_name+10,"ut") == 0)
isflo=OUT_PKT;
else if (strcasecmp(de->d_name+10,"pk") == 0)