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

Added -v switch to mbfile

Browse Source
This commit is contained in:
Michiel Broek 2002-06-15 14:00:49 +00:00
parent 51c58dcb88
commit b23210284a
10 changed files with 89 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mbfido/Makefile
View File

@ -17,7 +17,7 @@ SRCS = addbbs.c backalias.c flock.c hatch.c mbdiff.c mgrutil.c pack.c \
createm.c createf.c createm.c createf.c
HDRS = addbbs.h backalias.h flock.h hatch.h mbdiff.h mgrutil.h pack.h \ HDRS = addbbs.h backalias.h flock.h hatch.h mbdiff.h mgrutil.h pack.h \
postnetmail.h scannews.h tosspkt.h addpkt.h bwrite.h forward.h \ postnetmail.h scannews.h tosspkt.h addpkt.h bwrite.h forward.h \
lhash.h mbfido.h mkftnhdr.h paths.h ptic.h sendmail.h tracker.h \ lhash.h mbfido.h mkftnhdr.h ptic.h sendmail.h tracker.h \
aliasdb.h fsort.h magic.h mbfile.h mover.h ping.h rfc2ftn.h \ aliasdb.h fsort.h magic.h mbfile.h mover.h ping.h rfc2ftn.h \
storeecho.h ulock.h announce.h fflist.h ftn2rfc.h makestat.h mbindex.h \ storeecho.h ulock.h announce.h fflist.h ftn2rfc.h makestat.h mbindex.h \
msgutil.h post.h rnews.h storenet.h utic.h areamgr.h filefind.h \ msgutil.h post.h rnews.h storenet.h utic.h areamgr.h filefind.h \
@ -49,7 +49,7 @@ MBINDEX_LIBS = ../lib/libmemwatch.a ../lib/libclcomm.a ../lib/libcommon.a ../lib
MBDIFF_LIBS = ../lib/libmemwatch.a ../lib/libclcomm.a ../lib/libcommon.a ../lib/libdbase.a MBDIFF_LIBS = ../lib/libmemwatch.a ../lib/libclcomm.a ../lib/libcommon.a ../lib/libdbase.a
MBFILE_LIBS = ../lib/libmemwatch.a ../lib/libclcomm.a ../lib/libcommon.a ../lib/libdbase.a ../lib/libdiesel.a MBFILE_LIBS = ../lib/libmemwatch.a ../lib/libclcomm.a ../lib/libcommon.a ../lib/libdbase.a ../lib/libdiesel.a
MBMSG_LIBS = ../lib/libmemwatch.a ../lib/libclcomm.a ../lib/libcommon.a ../lib/libmsgbase.a ../lib/libdbase.a MBMSG_LIBS = ../lib/libmemwatch.a ../lib/libclcomm.a ../lib/libcommon.a ../lib/libmsgbase.a ../lib/libdbase.a
OTHER = Makefile README maptabs.tgz paths.h.in OTHER = Makefile README maptabs.tgz
TARGET = mbfido mbseq mbaff mbindex mbdiff mbfile mbmsg TARGET = mbfido mbseq mbaff mbindex mbdiff mbfile mbmsg
#################################################################################################################### ####################################################################################################################
@ -160,7 +160,7 @@ magic.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/c
mbfile.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfkill.h mbfadopt.h mbfindex.h mbfcheck.h mbfpack.h mbflist.h mbfimport.h mbftoberep.h mbfmove.h mbfdel.h mbfutil.h mbfile.h mbfile.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfkill.h mbfadopt.h mbfindex.h mbfcheck.h mbfpack.h mbflist.h mbfimport.h mbftoberep.h mbfmove.h mbfdel.h mbfutil.h mbfile.h
mover.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h mover.h mover.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h mover.h
post.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h post.h post.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h post.h
rnews.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/dbdupe.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/msg.h ../lib/msgtext.h pack.h rfc2ftn.h mbfido.h paths.h rnews.h rnews.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/dbdupe.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/msg.h ../lib/msgtext.h pack.h rfc2ftn.h mbfido.h ../paths.h rnews.h
storenet.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbmsgs.h ../lib/dbuser.h rollover.h storenet.h storenet.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbmsgs.h ../lib/dbuser.h rollover.h storenet.h
utic.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h mover.h tic.h utic.h utic.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h mover.h tic.h utic.h
announce.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h ../lib/diesel.h grlist.h msgutil.h announce.h announce.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h ../lib/diesel.h grlist.h msgutil.h announce.h

12
mbfido/forward.c
View File

@ -51,7 +51,7 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
char *subject = NULL, *temp, *fwdfile = NULL, *ticfile = NULL, fname[PATH_MAX], *ticname; char *subject = NULL, *temp, *fwdfile = NULL, *ticfile = NULL, fname[PATH_MAX], *ticname;
FILE *fp, *fi, *net; FILE *fp, *fi, *net;
char flavor; char flavor;
faddr *dest, *route, *Fa; faddr *dest, *routeto, *Fa;
int i, z, n; int i, z, n;
time_t now, ftime; time_t now, ftime;
fa_list *tmp; fa_list *tmp;
@ -108,11 +108,11 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
flavor = 'h'; flavor = 'h';
if (nodes.RouteVia.zone) if (nodes.RouteVia.zone)
route = fido2faddr(nodes.RouteVia); routeto = fido2faddr(nodes.RouteVia);
else else
route = fido2faddr(Node); routeto = fido2faddr(Node);
dest = fido2faddr(Node); dest = fido2faddr(Node);
attach(*route, fwdfile, LEAVE, flavor); attach(*routeto, fwdfile, LEAVE, flavor);
// if (strlen(CFG.dospath)) // if (strlen(CFG.dospath))
// subject = xstrcpy(Unix2Dos(fwdfile)); // subject = xstrcpy(Unix2Dos(fwdfile));
@ -286,7 +286,7 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
fprintf(fp, "Pw %s\r\n", nodes.Fpasswd); fprintf(fp, "Pw %s\r\n", nodes.Fpasswd);
fclose(fp); fclose(fp);
attach(*route, ticfile, KFS, flavor); attach(*routeto, ticfile, KFS, flavor);
} else { } else {
WriteError("$Can't create %s", ticfile); WriteError("$Can't create %s", ticfile);
} }
@ -325,7 +325,7 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
SearchNode(Node); SearchNode(Node);
free(ticfile); free(ticfile);
free(fwdfile); free(fwdfile);
tidy_faddr(route); tidy_faddr(routeto);
} }

27
mbfido/mbfadopt.c
View File

@ -43,6 +43,7 @@
extern int do_quiet; /* Supress screen output */ extern int do_quiet; /* Supress screen output */
extern int do_annon; /* Supress announce file */ extern int do_annon; /* Supress announce file */
extern int do_novir; /* Suppess virus check */
void AdoptFile(int Area, char *File, char *Description) void AdoptFile(int Area, char *File, char *Description)
@ -91,11 +92,15 @@ void AdoptFile(int Area, char *File, char *Description)
printf("Can't copy file to %s, %s\n", temp2, strerror(rc)); printf("Can't copy file to %s, %s\n", temp2, strerror(rc));
die(0); die(0);
} else { } else {
if (!do_quiet) { if (do_novir == FALSE) {
printf("Virscan \b\b\b\b\b\b\b\b\b\b"); if (!do_quiet) {
fflush(stdout); printf("Virscan \b\b\b\b\b\b\b\b\b\b");
fflush(stdout);
}
IsVirus = VirScan(tmpdir);
} else {
IsVirus = FALSE;
} }
IsVirus = VirScan(tmpdir);
if (IsVirus) { if (IsVirus) {
DeleteVirusWork(); DeleteVirusWork();
chdir(pwd); chdir(pwd);
@ -113,12 +118,16 @@ void AdoptFile(int Area, char *File, char *Description)
if (!UnPacked) if (!UnPacked)
die(0); die(0);
if (!do_quiet) { if (do_novir == FALSE) {
printf("Virscan \b\b\b\b\b\b\b\b\b\b"); if (!do_quiet) {
fflush(stdout); printf("Virscan \b\b\b\b\b\b\b\b\b\b");
} fflush(stdout);
}
IsVirus = VirScan(tmpdir);
} else {
IsVirus = FALSE;
}
IsVirus = VirScan(tmpdir);
if (IsVirus) { if (IsVirus) {
DeleteVirusWork(); DeleteVirusWork();
chdir(pwd); chdir(pwd);

5
mbfido/mbfile.c
View File

@ -52,6 +52,7 @@
extern int do_quiet; /* Supress screen output */ extern int do_quiet; /* Supress screen output */
int do_annon = FALSE; /* Suppress announce on new files */ int do_annon = FALSE; /* Suppress announce on new files */
int do_novir = FALSE; /* Suppress virus check */
int do_adopt = FALSE; /* Adopt a file */ int do_adopt = FALSE; /* Adopt a file */
int do_pack = FALSE; /* Pack filebase */ int do_pack = FALSE; /* Pack filebase */
int do_check = FALSE; /* Check filebase */ int do_check = FALSE; /* Check filebase */
@ -190,6 +191,8 @@ int main(int argc, char **argv)
do_quiet = TRUE; do_quiet = TRUE;
} else if (!strncasecmp(argv[i], "-a", 2)) { } else if (!strncasecmp(argv[i], "-a", 2)) {
do_annon = TRUE; do_annon = TRUE;
} else if (!strncasecmp(argv[i], "-v", 2)) {
do_novir = TRUE;
} }
} }
@ -203,6 +206,8 @@ int main(int argc, char **argv)
Syslog(' ', " "); Syslog(' ', " ");
Syslog(' ', "MBFILE v%s", VERSION); Syslog(' ', "MBFILE v%s", VERSION);
Syslog(' ', cmd); Syslog(' ', cmd);
if (do_novir)
Syslog('!', "WARNING: running without virus checking");
free(cmd); free(cmd);
if (!do_quiet) if (!do_quiet)

57
mbfido/mbfimport.c
View File

@ -43,6 +43,7 @@
extern int do_quiet; /* Supress screen output */ extern int do_quiet; /* Supress screen output */
extern int do_annon; /* Supress announce files */ extern int do_annon; /* Supress announce files */
extern int do_novir; /* Supress virus scanning */
void ImportFiles(int Area) void ImportFiles(int Area)
@ -112,12 +113,14 @@ void ImportFiles(int Area)
printf("Can't copy file to %s, %s\n", temp2, strerror(rc)); printf("Can't copy file to %s, %s\n", temp2, strerror(rc));
Doit = FALSE; Doit = FALSE;
} else { } else {
if (!do_quiet) { if (do_novir == FALSE) {
printf("Virscan \b\b\b\b\b\b\b\b\b\b"); if (!do_quiet) {
fflush(stdout); printf("Virscan \b\b\b\b\b\b\b\b\b\b");
} fflush(stdout);
if (VirScan(tmpdir)) { }
Doit = FALSE; if (VirScan(tmpdir)) {
Doit = FALSE;
}
} }
} }
} else { } else {
@ -126,12 +129,14 @@ void ImportFiles(int Area)
fflush(stdout); fflush(stdout);
} }
if (UnpackFile(temp)) { if (UnpackFile(temp)) {
if (!do_quiet) { if (do_novir == FALSE) {
printf("Virscan \b\b\b\b\b\b\b\b\b\b"); if (!do_quiet) {
fflush(stdout); printf("Virscan \b\b\b\b\b\b\b\b\b\b");
} fflush(stdout);
if (VirScan(tmpdir)) { }
Doit = FALSE; if (VirScan(tmpdir)) {
Doit = FALSE;
}
} }
} else { } else {
Doit = FALSE; Doit = FALSE;
@ -311,12 +316,14 @@ void ImportFiles(int Area)
WriteError("Can't copy file to %s, %s", temp2, strerror(rc)); WriteError("Can't copy file to %s, %s", temp2, strerror(rc));
Doit = FALSE; Doit = FALSE;
} else { } else {
if (!do_quiet) { if (do_novir == FALSE) {
printf("Virscan \b\b\b\b\b\b\b\b\b\b"); if (!do_quiet) {
fflush(stdout); printf("Virscan \b\b\b\b\b\b\b\b\b\b");
} fflush(stdout);
if (VirScan(tmpdir)) { }
Doit = FALSE; if (VirScan(tmpdir)) {
Doit = FALSE;
}
} }
} }
} else { } else {
@ -325,12 +332,14 @@ void ImportFiles(int Area)
fflush(stdout); fflush(stdout);
} }
if (UnpackFile(temp)) { if (UnpackFile(temp)) {
if (!do_quiet) { if (do_novir == FALSE) {
printf("Virscan \b\b\b\b\b\b\b\b\b\b"); if (!do_quiet) {
fflush(stdout); printf("Virscan \b\b\b\b\b\b\b\b\b\b");
} fflush(stdout);
if (VirScan(tmpdir)) { }
Doit = FALSE; if (VirScan(tmpdir)) {
Doit = FALSE;
}
} }
} else { } else {
Doit = FALSE; Doit = FALSE;

1
mbfido/mbfutil.c
View File

@ -131,6 +131,7 @@ void Help(void)
colour(CYAN, BLACK); colour(CYAN, BLACK);
printf(" -a -announce Supress announce added files\n"); printf(" -a -announce Supress announce added files\n");
printf(" -q -quiet Quiet mode\n"); printf(" -q -quiet Quiet mode\n");
printf(" -v -virus Suppress virus scanning, use with care\n");
die(0); die(0);
} }

8
mbfido/paths.h.in
View File

@ -1,8 +0,0 @@
/*
* $Id$
*
* Autogenerated by configure
*/
#define _PATH_COMPRESS "@COMPRESS@"
#define _PATH_GZIP "@GZIP@"

16
mbfido/postnetmail.c
View File

@ -76,7 +76,7 @@ int postnetmail(FILE *fp, faddr *f, faddr *t, char *orig, char *subject, time_t
char System[36], ext[4]; char System[36], ext[4];
int result = 1, email = FALSE, fmpt = 0, topt = 0; int result = 1, email = FALSE, fmpt = 0, topt = 0;
faddr *ta, *ra; faddr *ta, *ra;
fidoaddr na, route, Orig; fidoaddr na, routeto, Orig;
FILE *sfp, *net; FILE *sfp, *net;
time_t now; time_t now;
struct tm *tm; struct tm *tm;
@ -224,7 +224,7 @@ int postnetmail(FILE *fp, faddr *f, faddr *t, char *orig, char *subject, time_t
if (SearchFidonet(na.zone)) if (SearchFidonet(na.zone))
sprintf(na.domain, "%s", fidonet.domain); sprintf(na.domain, "%s", fidonet.domain);
switch(TrackMail(na, &route)) { switch(TrackMail(na, &routeto)) {
case R_LOCAL: case R_LOCAL:
/* /*
* Check the To: field. * Check the To: field.
@ -328,7 +328,7 @@ int postnetmail(FILE *fp, faddr *f, faddr *t, char *orig, char *subject, time_t
case R_DIRECT: case R_DIRECT:
case R_ROUTE: case R_ROUTE:
Syslog('+', "Route netmail via %s", aka2str(route)); Syslog('+', "Route netmail via %s", aka2str(routeto));
if (!strcasecmp(t->name, (char *)"ping") && DoPing) { if (!strcasecmp(t->name, (char *)"ping") && DoPing) {
Syslog('+', "In transit \"Ping\" message detected"); Syslog('+', "In transit \"Ping\" message detected");
Ping(f, t, fp, TRUE); Ping(f, t, fp, TRUE);
@ -339,9 +339,9 @@ int postnetmail(FILE *fp, faddr *f, faddr *t, char *orig, char *subject, time_t
* Forward this message. Will not work for unknown * Forward this message. Will not work for unknown
* direct links. * direct links.
*/ */
if (SearchNode(route)) { if (SearchNode(routeto)) {
memset(&Orig, 0, sizeof(Orig)); memset(&Orig, 0, sizeof(Orig));
ra = fido2faddr(route); ra = fido2faddr(routeto);
ta = bestaka_s(ra); ta = bestaka_s(ra);
Orig.zone = ta->zone; Orig.zone = ta->zone;
Orig.net = ta->net; Orig.net = ta->net;
@ -360,7 +360,7 @@ int postnetmail(FILE *fp, faddr *f, faddr *t, char *orig, char *subject, time_t
else else
sprintf(ext, (char *)"nnn"); sprintf(ext, (char *)"nnn");
if ((net = OpenPkt(Orig , route, (char *)ext)) == NULL) { if ((net = OpenPkt(Orig , routeto, (char *)ext)) == NULL) {
net_bad++; net_bad++;
WriteError("Can't create netmail"); WriteError("Can't create netmail");
return 0; return 0;
@ -374,7 +374,7 @@ int postnetmail(FILE *fp, faddr *f, faddr *t, char *orig, char *subject, time_t
*/ */
Syslog('!', "Warning: not a direct link, check setup"); Syslog('!', "Warning: not a direct link, check setup");
memset(&Orig, 0, sizeof(Orig)); memset(&Orig, 0, sizeof(Orig));
ra = fido2faddr(route); ra = fido2faddr(routeto);
ta = bestaka_s(ra); ta = bestaka_s(ra);
Orig.zone = ta->zone; Orig.zone = ta->zone;
Orig.net = ta->net; Orig.net = ta->net;
@ -383,7 +383,7 @@ int postnetmail(FILE *fp, faddr *f, faddr *t, char *orig, char *subject, time_t
tidy_faddr(ra); tidy_faddr(ra);
tidy_faddr(ta); tidy_faddr(ta);
if ((net = OpenPkt(Orig , route, (char *)"nnn")) == NULL) { if ((net = OpenPkt(Orig , routeto, (char *)"nnn")) == NULL) {
net_bad++; net_bad++;
WriteError("Can't create netmail"); WriteError("Can't create netmail");
return 0; return 0;

2
mbfido/rnews.c
View File

@ -44,7 +44,7 @@
#include "pack.h" #include "pack.h"
#include "rfc2ftn.h" #include "rfc2ftn.h"
#include "mbfido.h" #include "mbfido.h"
#include "paths.h" #include "../paths.h"
#include "rnews.h" #include "rnews.h"

28
mbfido/tracker.c
View File

@ -48,13 +48,13 @@ extern long nodes_pos;
* If not, return FALSE. The calling program must bounce the * If not, return FALSE. The calling program must bounce the
* original message. * original message.
*/ */
int TrackMail(fidoaddr too, fidoaddr *route) int TrackMail(fidoaddr too, fidoaddr *routeto)
{ {
int rc, i; int rc, i;
Syslog('r', "Tracking destination %s", aka2str(too)); Syslog('r', "Tracking destination %s", aka2str(too));
rc = GetRoute(aka2str(too) , route); rc = GetRoute(aka2str(too) , routeto);
if (rc == R_NOROUTE) { if (rc == R_NOROUTE) {
WriteError("No route to %s, not parsed", aka2str(too)); WriteError("No route to %s, not parsed", aka2str(too));
return R_NOROUTE; return R_NOROUTE;
@ -74,26 +74,26 @@ int TrackMail(fidoaddr too, fidoaddr *route)
* Now look again if from the routing result we find a * Now look again if from the routing result we find a
* direct link. If so, maybe adjust something. * direct link. If so, maybe adjust something.
*/ */
if (SearchNode(*route)) { if (SearchNode(*routeto)) {
Syslog('r', "Known node: %s", aka2str(nodes.Aka[0])); Syslog('r', "Known node: %s", aka2str(nodes.Aka[0]));
Syslog('r', "Check \"too\" %s", aka2str(too)); Syslog('r', "Check \"too\" %s", aka2str(too));
if (nodes.RouteVia.zone) { if (nodes.RouteVia.zone) {
route->zone = nodes.RouteVia.zone; routeto->zone = nodes.RouteVia.zone;
route->net = nodes.RouteVia.net; routeto->net = nodes.RouteVia.net;
route->node = nodes.RouteVia.node; routeto->node = nodes.RouteVia.node;
route->point = nodes.RouteVia.point; routeto->point = nodes.RouteVia.point;
sprintf(route->domain, "%s", nodes.RouteVia.domain); sprintf(routeto->domain, "%s", nodes.RouteVia.domain);
return R_ROUTE; return R_ROUTE;
} else { } else {
for (i = 0; i < 20; i++) for (i = 0; i < 20; i++)
if (route->zone == nodes.Aka[i].zone) if (routeto->zone == nodes.Aka[i].zone)
break; break;
route->zone = nodes.Aka[i].zone; routeto->zone = nodes.Aka[i].zone;
route->net = nodes.Aka[i].net; routeto->net = nodes.Aka[i].net;
route->node = nodes.Aka[i].node; routeto->node = nodes.Aka[i].node;
route->point = nodes.Aka[i].point; routeto->point = nodes.Aka[i].point;
sprintf(route->domain, "%s", nodes.Aka[i].domain); sprintf(routeto->domain, "%s", nodes.Aka[i].domain);
return R_ROUTE; return R_ROUTE;
} }
} }