--- sbbs/src/sbbs3/sbbsecho.c	2018/04/24 16:41:24	1.1.1.1
+++ sbbs/src/sbbs3/sbbsecho.c	2018/04/24 16:43:58	1.1.1.2
@@ -2,13 +2,13 @@
 
 /* Synchronet FidoNet EchoMail Scanning/Tossing and NetMail Tossing Utility */
 
-/* $Id: sbbsecho.c,v 1.1.1.1 2018/04/24 16:41:24 root Exp $ */
+/* $Id: sbbsecho.c,v 1.1.1.2 2018/04/24 16:43:58 root Exp $ */
 
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2006 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2011 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -72,7 +72,6 @@ smb_t *smb,*email;
 long misc=(IMPORT_PACKETS|IMPORT_NETMAIL|IMPORT_ECHOMAIL|EXPORT_ECHOMAIL
 			|DELETE_NETMAIL|DELETE_PACKETS);
 ulong netmail=0;
-int log_level=LOG_NOTICE;
 char tmp[256],pkt_type=0;
 int secure,cur_smb=0;
 FILE *fidologfile=NULL;
@@ -141,7 +140,7 @@ int lprintf(int level, char *fmat, ...)
 	truncsp(sbuf);
 	printf("%s\n",sbuf);
 
-	if(level<=log_level)
+	if(level<=cfg.log_level)
 		logprintf("%s",sbuf);
 	return(chcount);
 }
@@ -165,7 +164,9 @@ void logprintf(char *str, ...)
 	now=time(NULL);
 	gm=localtime(&now);
 	fprintf(fidologfile,"%02u/%02u/%02u %02u:%02u:%02u %s\n"
-		,gm->tm_mon+1,gm->tm_mday,TM_YEAR(gm->tm_year),gm->tm_hour,gm->tm_min,gm->tm_sec
+		,(scfg.sys_misc&SM_EURODATE) ? gm->tm_mday : gm->tm_mon+1
+		,(scfg.sys_misc&SM_EURODATE) ? gm->tm_mon+1 : gm->tm_mday
+		,TM_YEAR(gm->tm_year),gm->tm_hour,gm->tm_min,gm->tm_sec
 		,buf);
 }
 
@@ -346,9 +347,9 @@ int write_flofile(char *attachment, fadd
 	else if(attr&ATTR_DIRECT) ch='d';
 	else ch='f';
 	if(dest.zone==sys_faddr.zone)		/* Default zone, use default outbound */
-		strcpy(outbound,cfg.outbound);
+		SAFECOPY(outbound,cfg.outbound);
 	else {								/* Inter-zone outbound is OUTBOUND.XXX */
-		sprintf(outbound,"%.*s.%03x"
+		SAFEPRINTF3(outbound,"%.*s.%03x"
 			,(int)strlen(cfg.outbound)-1,cfg.outbound,dest.zone);
 		MKDIR(outbound);
 		backslash(outbound);
@@ -435,6 +436,7 @@ int create_netmail(char *to, char *subje
 			if(i<cfg.nodecfgs)
 				attr=cfg.nodecfg[i].attr; } }
 
+	MKDIR(scfg.netmail_dir);
 	do {
 		for(i=startmsg;i;i++) {
 			sprintf(fname,"%s%u.msg",scfg.netmail_dir,i);
@@ -837,6 +839,7 @@ void alter_areas(area_t* add_area, area_
 								lprintf(LOG_ERR,"ERROR line %d allocating memory for area "
 									"#%u uplinks.",__LINE__,i+1);
 								bail(1); 
+								return;
 							}
 
 						fprintf(afileout,"%-16s%-23s ",field1,field2);
@@ -886,7 +889,9 @@ void alter_areas(area_t* add_area, area_
 							*(cfg.area[i].uplinks)))==NULL) {
 							lprintf(LOG_ERR,"ERROR line %d allocating memory for area "
 								"#%u uplinks.",__LINE__,i+1);
-							bail(1); }
+							bail(1); 
+							return;
+						}
 						memcpy(&cfg.area[i].uplink[j],&addr,sizeof(faddr_t));
 
 						fprintf(afileout,"%-16s%-23s ",field1,field2);
@@ -1252,11 +1257,15 @@ void command(char* instr, faddr_t addr,
 			,sizeof(char *)*add_area.tags+1))==NULL) {
 			lprintf(LOG_ERR,"ERROR line %d allocating memory for add area tag #%u"
 				,__LINE__,add_area.tags+1);
-			bail(1); }
+			bail(1); 
+			return;
+		}
 		if((add_area.tag[add_area.tags]=(char *)malloc(strlen(instr)+1))==NULL) {
 			lprintf(LOG_ERR,"ERROR line %d allocating memory for add area tag #%u"
 				,__LINE__,add_area.tags+1);
-			bail(1); }
+			bail(1); 
+			return;
+		}
 		strcpy(add_area.tag[add_area.tags],instr);
 		add_area.tags++;
 		alter_areas(&add_area,&del_area,addr,to);
@@ -1271,11 +1280,15 @@ void command(char* instr, faddr_t addr,
 			,sizeof(char *)*del_area.tags+1))==NULL) {
 			lprintf(LOG_ERR,"ERROR line %d allocating memory for del area tag #%u"
 				,__LINE__,del_area.tags+1);
-			bail(1); }
+			bail(1); 
+			return;
+		}
 		if((del_area.tag[del_area.tags]=(char *)malloc(strlen(instr)+1))==NULL) {
 			lprintf(LOG_ERR,"ERROR line %d allocating memory for del area tag #%u"
 				,__LINE__,del_area.tags+1);
-			bail(1); }
+			bail(1); 
+			return;
+		}
 		strcpy(del_area.tag[del_area.tags],instr);
 		del_area.tags++;
 		alter_areas(&add_area,&del_area,addr,to);
@@ -1298,9 +1311,12 @@ char* process_areafix(faddr_t addr, char
 	ulong l,m;
 	area_t add_area,del_area;
 
+	lprintf(LOG_INFO,"Areafix Request received from %s"
+			,smb_faddrtoa(&addr,NULL));
+	
 	p=(char *)inbuf;
 
-	while(*p==1) {				/* Skip kludge lines 11/05/95 */
+	while(*p==CTRL_A) {			/* Skip kludge lines 11/05/95 */
 		FIND_CHAR(p,'\r');
 		if(*p) {
 			p++;				/* Skip CR (required) */
@@ -1322,12 +1338,20 @@ char* process_areafix(faddr_t addr, char
 
 	i=matchnode(addr,0);
 	if(i>=cfg.nodecfgs) {
+		lprintf(LOG_NOTICE,"Areafix not configured for %s", smb_faddrtoa(&addr,NULL));
 		create_netmail(to,"Areafix Request"
 			,"Your node is not configured for Areafix, please contact your hub.\r\n",addr,FALSE);
 		sprintf(body,"An areafix request was made by node %s.\r\nThis node "
 			"is not currently configured for areafix.\r\n"
 			,smb_faddrtoa(&addr,NULL));
-		return(body); }
+		lprintf(LOG_DEBUG,"areafix debug, nodes=%u",cfg.nodecfgs);
+		{
+			int j;
+			for(j=0;j<cfg.nodecfgs;j++)
+				lprintf(LOG_DEBUG,smb_faddrtoa(&cfg.nodecfg[j].faddr,NULL));
+		}
+		return(body); 
+	}
 
 	if(stricmp(cfg.nodecfg[i].password,password)) {
 		create_netmail(to,"Areafix Request","Invalid Password.",addr,FALSE);
@@ -1345,7 +1369,7 @@ char* process_areafix(faddr_t addr, char
 	del_area.tag=NULL;
 	for(l=0;l<m;l++) { 
 		while(*(p+l) && isspace(*(p+l))) l++;
-		while(*(p+l)==1) {				/* Ignore kludge lines June-13-2004 */
+		while(*(p+l)==CTRL_A) {				/* Ignore kludge lines June-13-2004 */
 			while(*(p+l) && *(p+l)!='\r') l++;
 			continue;
 		}
@@ -1363,12 +1387,16 @@ char* process_areafix(faddr_t addr, char
 					,sizeof(char *)*add_area.tags+1))==NULL) {
 					lprintf(LOG_ERR,"ERROR line %d allocating memory for add area "
 						"tag #%u",__LINE__,add_area.tags+1);
-					bail(1); }
+					bail(1); 
+					return(NULL);
+				}
 				if((add_area.tag[add_area.tags]=(char *)malloc(strlen(str)+1))
 					==NULL) {
 					lprintf(LOG_ERR,"ERROR line %d allocating memory for add area "
 						"tag #%u",__LINE__,add_area.tags+1);
-					bail(1); }
+					bail(1); 
+					return(NULL);
+				}
 				strcpy(add_area.tag[add_area.tags],str);
 				add_area.tags++;
 				break;
@@ -1377,12 +1405,16 @@ char* process_areafix(faddr_t addr, char
 					,sizeof(char *)*del_area.tags+1))==NULL) {
 					lprintf(LOG_ERR,"ERROR line %d allocating memory for del area "
 						"tag #%u",__LINE__,del_area.tags+1);
-					bail(1); }
+					bail(1); 
+					return(NULL);
+				}
 				if((del_area.tag[del_area.tags]=(char *)malloc(strlen(str)+1))
 					==NULL) {
 					lprintf(LOG_ERR,"ERROR line %d allocating memory for del area "
 						"tag #%u",__LINE__,del_area.tags+1);
-					bail(1); }
+					bail(1); 
+					return(NULL);
+				}
 				strcpy(del_area.tag[del_area.tags],str);
 				del_area.tags++;
 				break;
@@ -1423,7 +1455,9 @@ int unpack(char *infile)
 	if((stream=fnopen(&file,infile,O_RDONLY))==NULL) {
 		lprintf(LOG_ERR,"ERROR line %d opening %s %s",__LINE__,infile
 			,strerror(errno));
-		bail(1); }
+		bail(1); 
+		return -1;
+	}
 	for(i=0;i<cfg.arcdefs;i++) {
 		str[0]=0;
 		fseek(stream,cfg.arcdef[i].byteloc,SEEK_SET);
@@ -1600,6 +1634,7 @@ int attachment(char *bundlename,faddr_t
 
 	memcpy(&attach.dest,&dest,sizeof(faddr_t));
 	strcpy(attach.fname,bundlename);
+	/* TODO: Write of unpacked struct */
 	fwrite(&attach,sizeof(attach_t),1,stream);
 	fclose(stream);
 	return(0);
@@ -1621,6 +1656,7 @@ void pack_bundle(char *infile,faddr_t de
 	if(infile==NULL || infile[0]==0) {
 		lprintf(LOG_ERR,"ERROR line %d invalid filename",__LINE__);
 		bail(1);
+		return;
 	}
 
 	node=matchnode(dest,0);
@@ -1640,9 +1676,9 @@ void pack_bundle(char *infile,faddr_t de
 		}
 
 		if(dest.zone==sys_faddr.zone)	/* Default zone, use default outbound */
-			strcpy(outbound,cfg.outbound);
+			SAFECOPY(outbound,cfg.outbound);
 		else {							/* Inter-zone outbound is OUTBOUND.XXX */
-			sprintf(outbound,"%.*s.%03x"
+			SAFEPRINTF3(outbound,"%.*s.%03x"
 				,(int)strlen(cfg.outbound)-1,cfg.outbound,dest.zone);
 			MKDIR(outbound);
 			backslash(outbound);
@@ -1669,7 +1705,8 @@ void pack_bundle(char *infile,faddr_t de
 					,misc&TRUNC_BUNDLES ? "\1FLAGS TFS\r" : "\1FLAGS KFS\r"
 					,dest,TRUE);
 			if(i) bail(1);
-			return; }
+			return; 
+		}
 
 	if(dest.point && !(misc&FLO_MAILER))
 		sprintf(fname,"%s%04hxp%03hx.%s",outbound,0,(short)dest.point,day);
@@ -1715,7 +1752,9 @@ void pack_bundle(char *infile,faddr_t de
 			if(delfile(infile))
 				lprintf(LOG_ERR,"ERROR line %d removing %s %s",__LINE__,infile
 					,strerror(errno));
-			return; } }
+			return; 
+		} 
+	}
 
 	pack(infile,str,dest);	/* Won't get here unless all bundles are full */
 }
@@ -1904,17 +1943,21 @@ ulong getlastmsg(uint subnum, ulong *ptr
 	ZERO_VAR(smbfile);
 	if(subnum>=scfg.total_subs) {
 		lprintf(LOG_ERR,"ERROR line %d getlastmsg %d",__LINE__,subnum);
-		bail(1); }
+		bail(1); 
+		return 0;
+	}
 	sprintf(smbfile.file,"%s%s",scfg.sub[subnum]->data_dir,scfg.sub[subnum]->code);
 	smbfile.retry_time=scfg.smb_retry_time;
 	if((i=smb_open(&smbfile))!=SMB_SUCCESS) {
 		lprintf(LOG_ERR,"ERROR %d line %d opening %s",i,__LINE__,smbfile.file);
-		return(0); }
+		return(0); 
+	}
 
 	if(!filelength(fileno(smbfile.shd_fp))) {			/* Empty base */
 		if(ptr) (*ptr)=0;
 		smb_close(&smbfile);
-		return(0); }
+		return(0); 
+	}
 	smb_close(&smbfile);
 	if(ptr) (*ptr)=smbfile.status.last_msg;
 	return(smbfile.status.total_msgs);
@@ -1957,10 +2000,10 @@ ulong loadmsgs(post_t** post, ulong ptr)
 		if(idx.number==0)	/* invalid message number, ignore */
 			continue;
 
-		if(idx.number<=ptr || idx.attr&MSG_DELETE)
+		if(idx.number<=ptr || (idx.attr&MSG_DELETE))
 			continue;
 
-		if(idx.attr&MSG_MODERATED && !(idx.attr&MSG_VALIDATED))
+		if((idx.attr&MSG_MODERATED) && !(idx.attr&MSG_VALIDATED))
 			break;
 
 		(*post)[l++]=idx;
@@ -2201,6 +2244,7 @@ char* getfmsg(FILE *stream, ulong *outle
 	if((fbuf=(char *)malloc(length+1))==NULL) {
 		lprintf(LOG_ERR,"ERROR line %d allocating %lu bytes of memory",__LINE__,length+1);
 		bail(1); 
+		return(NULL);
 	}
 
 	fseek(stream,start,SEEK_SET);
@@ -2235,7 +2279,7 @@ int fmsgtosmsg(uchar* fbuf, fmsghdr_t fm
 	ushort	xlat=XLAT_NONE,net;
 	ulong	l,m,length,bodylen,taillen,crc;
 	ulong	save;
-	long	dupechk_hashes=SMB_HASH_SOURCE_ALL;
+	long	dupechk_hashes=SMB_HASH_SOURCE_DUPE;
 	faddr_t faddr,origaddr,destaddr;
 	smb_t*	smbfile;
 	char	fname[MAX_PATH+1];
@@ -2314,7 +2358,7 @@ int fmsgtosmsg(uchar* fbuf, fmsghdr_t fm
 		}
 
 		ch=fbuf[l];
-		if(ch==1 && cr) {	/* kludge line */
+		if(ch==CTRL_A && cr) {	/* kludge line */
 
 			if(!strncmp((char *)fbuf+l+1,"TOPT ",5))
 				destaddr.point=atoi((char *)fbuf+l+6);
@@ -2484,6 +2528,8 @@ int fmsgtosmsg(uchar* fbuf, fmsghdr_t fm
 		net=NET_FIDO;						/* Record origin address */
 
 	if(net) {
+		if(origaddr.zone==0)
+			origaddr.zone = sys_faddr.zone;
 		smb_hfield(&msg,SENDERNETTYPE,sizeof(ushort),&net);
 		smb_hfield(&msg,SENDERNETADDR,sizeof(fidoaddr_t),&origaddr); }
 
@@ -2514,11 +2560,14 @@ int fmsgtosmsg(uchar* fbuf, fmsghdr_t fm
 		msg.idx.number=smbfile->status.last_msg+1;		/* needed for MSG-ID generation */
 
 		/* Generate default (RFC822) message-id (always) */
-		SAFECOPY(msg_id,get_msgid(&scfg,subnum,&msg));
+		get_msgid(&scfg,subnum,&msg,msg_id,sizeof(msg_id));
 		smb_hfield_str(&msg,RFC822MSGID,msg_id);
 	}
 	if(smbfile->status.max_crcs==0)
 		dupechk_hashes&=~(1<<SMB_HASH_SOURCE_BODY);
+	/* Bad echo area collects a *lot* of messages, and thus, hashes - so no dupe checking */
+	if(cfg.badecho>=0 && subnum==cfg.area[cfg.badecho].sub)
+		dupechk_hashes=SMB_HASH_SOURCE_NONE;
 
 	i=smb_addmsg(smbfile, &msg, storage, dupechk_hashes, xlat, sbody, stail);
 
@@ -2546,7 +2595,7 @@ void getzpt(FILE *stream, fmsghdr_t *hdr
 	for(i=0;i<len;i++) {
 		if(buf[i]=='\n')	/* ignore line-feeds */
 			continue;
-		if((!i || cr) && buf[i]==1) {	/* kludge */
+		if((!i || cr) && buf[i]==CTRL_A) {	/* kludge */
 			if(!strncmp(buf+i+1,"TOPT ",5))
 				hdr->destpoint=atoi(buf+i+6);
 			else if(!strncmp(buf+i+1,"FMPT ",5))
@@ -2866,7 +2915,9 @@ void gen_psb(addrlist_t *seenbys,addrlis
 					,sizeof(faddr_t)*(seenbys->addrs+1)))==NULL) {
 					lprintf(LOG_ERR,"ERROR line %d allocating memory for message "
 						"seenbys.",__LINE__);
-					bail(1); }
+					bail(1); 
+					return;
+				}
 				memcpy(&seenbys->addr[seenbys->addrs],&addr,sizeof(faddr_t));
 				seenbys->addrs++;
 				++i; }
@@ -2875,13 +2926,17 @@ void gen_psb(addrlist_t *seenbys,addrlis
 				p1=strstr(p+10,"\nSEEN-BY:");
 			if(!p1)
 				break;
-			p=p1; } }
+			p=p1; 
+		} 
+	}
 	else {
 		if((seenbys->addr=(faddr_t *)realloc(seenbys->addr
 			,sizeof(faddr_t)))==NULL) {
 			lprintf(LOG_ERR,"ERROR line %d allocating memory for message seenbys."
 				,__LINE__);
-			bail(1); }
+			bail(1); 
+			return;
+		}
 		memset(&seenbys->addr[0],0,sizeof(faddr_t)); }
 
 	if(paths->addr) {
@@ -2921,19 +2976,25 @@ void gen_psb(addrlist_t *seenbys,addrlis
 					,sizeof(faddr_t)*(paths->addrs+1)))==NULL) {
 					lprintf(LOG_ERR,"ERROR line %d allocating memory for message "
 						"paths.",__LINE__);
-					bail(1); }
+					bail(1); 
+					return;
+				}
 				memcpy(&paths->addr[paths->addrs],&addr,sizeof(faddr_t));
 				paths->addrs++;
 				++i; }
 			if((p1=strstr(p+7,"\1PATH:"))==NULL)
 				break;
-			p=p1; } }
+			p=p1; 
+		} 
+	}
 	else {
 		if((paths->addr=(faddr_t *)realloc(paths->addr
 			,sizeof(faddr_t)))==NULL) {
 			lprintf(LOG_ERR,"ERROR line %d allocating memory for message paths."
 				,__LINE__);
-			bail(1); }
+			bail(1); 
+			return;
+		}
 		memset(&paths->addr[0],0,sizeof(faddr_t)); }
 }
 
@@ -3073,11 +3134,13 @@ void pkt_to_pkt(uchar *fbuf,areasbbs_t a
 		attach_bundles();
 		if(!(misc&FLO_MAILER))
 			attachment(0,faddr,ATTACHMENT_NETMAIL);
-		return; }
+		return; 
+	}
 
 	if(fbuf==NULL) {
 		lprintf(LOG_ERR,"ERROR line %d allocating fbuf",__LINE__);
-		return; }
+		return; 
+	}
 	/* We want to see if there's already a packet open for this area.   */
 	/* If not, we'll open a new one.  Once we have a packet, we'll add  */
 	/* messages to it as they come in.	If necessary, we'll close an    */
@@ -3089,7 +3152,7 @@ void pkt_to_pkt(uchar *fbuf,areasbbs_t a
 			check_psb(&seenbys,area.uplink[j]))))
 			continue;
 		node=matchnode(area.uplink[j],0);
-		if(node<cfg.nodecfgs && cfg.nodecfg[node].attr&ATTR_PASSIVE)
+		if(node<cfg.nodecfgs && (cfg.nodecfg[node].attr&ATTR_PASSIVE))
 			continue;
 		sysaddr=getsysfaddr(area.uplink[j].zone);
 		printf("%s ",smb_faddrtoa(&area.uplink[j],NULL));
@@ -3110,14 +3173,17 @@ void pkt_to_pkt(uchar *fbuf,areasbbs_t a
 						,O_WRONLY|O_APPEND))==NULL) {
 						lprintf(LOG_ERR,"ERROR line %d opening %s %s",__LINE__
 							,outpkt[i].filename,strerror(errno));
-						bail(1); }
+						bail(1); 
+						return;
+					}
 					outpkt[i].curopen=1; }
 				if((strlen((char *)fbuf)+1+ftell(outpkt[i].stream))
 					<=cfg.maxpktsize) {
 					fmsghdr.destnode=area.uplink[j].node;
 					fmsghdr.destnet=area.uplink[j].net;
 					fmsghdr.destzone=area.uplink[j].zone;
-					putfmsg(outpkt[i].stream,fbuf,fmsghdr,area,seenbys,paths); }
+					putfmsg(outpkt[i].stream,fbuf,fmsghdr,area,seenbys,paths); 
+				}
 				else {
 					terminate_packet(outpkt[i].stream);
 					fclose(outpkt[i].stream);
@@ -3148,7 +3214,9 @@ void pkt_to_pkt(uchar *fbuf,areasbbs_t a
 				,O_WRONLY|O_CREAT))==NULL) {
 				lprintf(LOG_ERR,"ERROR line %d opening %s %s"
 					,__LINE__,outpkt[i].filename,strerror(errno));
-				bail(1); }
+				bail(1); 
+				return;
+			}
 			pkthdr.orignode=sysaddr.node;
 			fmsghdr.destnode=pkthdr.destnode=area.uplink[j].node;
 			if(node<cfg.nodecfgs && cfg.nodecfg[node].pkt_type==PKT_TWO_TWO) {
@@ -3309,7 +3377,7 @@ int import_netmail(char *path,fmsghdr_t
 	}
 
 	if(match>=scfg.total_faddrs && !(misc&IGNORE_ADDRESS)) {
-		printf("Wrong address");
+		printf("Foreign address");
 		if(!path[0]) {
 			printf(" - ");
 			pkt_to_msg(fidomsg,&hdr,info);
@@ -3322,11 +3390,11 @@ int import_netmail(char *path,fmsghdr_t
 			printf("Orphaned");
 			return(1); 
 		}
-		if(hdr.attr&FIDO_RECV && !(misc&IGNORE_RECV)) {
+		if((hdr.attr&FIDO_RECV) && !(misc&IGNORE_RECV)) {
 			printf("Already received");
 			return(3); 
 		}
-		if(hdr.attr&FIDO_LOCAL && !(misc&LOCAL_NETMAIL)) {
+		if((hdr.attr&FIDO_LOCAL) && !(misc&LOCAL_NETMAIL)) {
 			printf("Created locally");
 			return(4); 
 		}
@@ -3341,7 +3409,10 @@ int import_netmail(char *path,fmsghdr_t
 		email->retry_time=scfg.smb_retry_time;
 		if((i=smb_open(email))!=SMB_SUCCESS) {
 			lprintf(LOG_ERR,"ERROR %d line %d opening %s",i,__LINE__,email->file);
-			bail(1); } }
+			bail(1); 
+			return -1;
+		} 
+	}
 
 	if(!filelength(fileno(email->shd_fp))) {
 		email->status.max_crcs=scfg.mail_maxcrcs;
@@ -3350,7 +3421,10 @@ int import_netmail(char *path,fmsghdr_t
 		email->status.attr=SMB_EMAIL;
 		if((i=smb_create(email))!=SMB_SUCCESS) {
 			lprintf(LOG_ERR,"ERROR %d creating %s",i,email->file);
-			bail(1); } }
+			bail(1); 
+			return -1;
+		} 
+	}
 
 	if(!stricmp(hdr.to,"AREAFIX") || !stricmp(hdr.to,"SBBSECHO")) {
 		fmsgbuf=getfmsg(fidomsg,NULL);
@@ -3493,6 +3567,7 @@ int import_netmail(char *path,fmsghdr_t
 void export_echomail(char *sub_code,faddr_t addr)
 {
 	char	str[1025],tear,cr;
+	char	msgid[256];
 	char*	buf=NULL;
 	char*	minus;
 	uchar*	fmsgbuf=NULL;
@@ -3510,6 +3585,7 @@ void export_echomail(char *sub_code,fadd
 	areasbbs_t fakearea;
 	addrlist_t msg_seen,msg_path;
     clock_t start_tick=0,export_ticks=0;
+	time_t	tt;
 
 	memset(&msg_seen,0,sizeof(addrlist_t));
 	memset(&msg_path,0,sizeof(addrlist_t));
@@ -3543,12 +3619,12 @@ void export_echomail(char *sub_code,fadd
 			if(!addr.zone && !(misc&IGNORE_MSGPTRS)) {
 				sprintf(str,"%s%s.sfp",scfg.sub[i]->data_dir,scfg.sub[i]->code);
 				if((file=nopen(str,O_RDONLY))!=-1) {
-					read(file,&ptr,sizeof(time_t));
+					read(file,&ptr,4);
 					close(file); } }
 
 			msgs=getlastmsg(i,&lastmsg,0);
 			if(!msgs || (!addr.zone && !(misc&IGNORE_MSGPTRS) && ptr>=lastmsg)) {
-				lprintf(LOG_INFO,"No new messages.");
+				lprintf(LOG_DEBUG,"No new messages.");
 				if(ptr>lastmsg && !addr.zone && !(misc&LEAVE_MSGPTRS)) {
 					lprintf(LOG_DEBUG,"Fixing new-scan pointer.");
 					sprintf(str,"%s%s.sfp",scfg.sub[i]->data_dir,scfg.sub[i]->code);
@@ -3638,10 +3714,11 @@ void export_echomail(char *sub_code,fadd
 
 				SAFECOPY(hdr.from,msg.from);
 
-				tm=localtime((time_t *)&msg.hdr.when_written.time);
-				sprintf(hdr.time,"%02u %3.3s %02u  %02u:%02u:%02u"
-					,tm->tm_mday,mon[tm->tm_mon],TM_YEAR(tm->tm_year)
-					,tm->tm_hour,tm->tm_min,tm->tm_sec);
+				tt=msg.hdr.when_written.time;
+				if((tm=localtime(&tt)) != NULL)
+					sprintf(hdr.time,"%02u %3.3s %02u  %02u:%02u:%02u"
+						,tm->tm_mday,mon[tm->tm_mon],TM_YEAR(tm->tm_year)
+						,tm->tm_hour,tm->tm_min,tm->tm_sec);
 
 				SAFECOPY(hdr.to,msg.to);
 
@@ -3680,7 +3757,7 @@ void export_echomail(char *sub_code,fadd
 					f+=sprintf(fmsgbuf+f,"\1FLAGS %.256s\r", msg.ftn_flags);
 
 				f+=sprintf(fmsgbuf+f,"\1MSGID: %.256s\r"
-					,ftn_msgid(scfg.sub[i],&msg));
+					,ftn_msgid(scfg.sub[i],&msg,msgid,sizeof(msgid)));
 
 				if(msg.ftn_reply!=NULL)			/* use original REPLYID */
 					f+=sprintf(fmsgbuf+f,"\1REPLY: %.256s\r", msg.ftn_reply);
@@ -3694,7 +3771,7 @@ void export_echomail(char *sub_code,fadd
 						smb_getmsghdr(&smb[cur_smb],&orig_msg);
 						smb_unlockmsghdr(&smb[cur_smb],&orig_msg);
 						f+=sprintf(fmsgbuf+f,"\1REPLY: %.256s\r"
-							,ftn_msgid(scfg.sub[i],&orig_msg));	
+							,ftn_msgid(scfg.sub[i],&orig_msg,msgid,sizeof(msgid)));	
 					}
 				}
 				if(msg.ftn_pid!=NULL)	/* use original PID */
@@ -3711,12 +3788,17 @@ void export_echomail(char *sub_code,fadd
 						f+=sprintf(fmsgbuf+f,"\1%.512s\r",(char*)msg.hfield_dat[l]);
 
 				for(l=0,cr=1;buf[l] && f<fmsgbuflen;l++) {
-					if(buf[l]==1) { /* Ctrl-A, so skip it and the next char */
+					if(buf[l]==CTRL_A) { /* Ctrl-A, so skip it and the next char */
+						char ch;
 						l++;
-						if(!buf[l])
+						if(buf[l]==0 || toupper(buf[l])=='Z')	/* EOF */
 							break;
-						continue; }
+						if((ch=ctrl_a_to_ascii_char(buf[l])) != 0)
+							fmsgbuf[f++]=ch;
+						continue; 
+					}
 					
+					/* Need to support converting sole-LFs to Hard-CR and soft-CR (0x8D) as well */
 					if(misc&STRIP_LF && buf[l]=='\n')	/* Ignore line feeds */
 						continue;
 
@@ -3735,12 +3817,13 @@ void export_echomail(char *sub_code,fadd
 						cr=1;
 					else
 						cr=0;
-					if(scfg.sub[i]->misc&SUB_ASCII || misc&ASCII_ONLY) {
+					if((scfg.sub[i]->misc&SUB_ASCII) || (misc&ASCII_ONLY)) {
 						if(buf[l]<' ' && buf[l]!='\r'
 							&& buf[l]!='\n')			/* Ctrl ascii */
 							buf[l]='.';             /* converted to '.' */
-						if((uchar)buf[l]>0x7f)		/* extended ASCII */
-							buf[l]='*'; }           /* converted to '*' */
+						if((uchar)buf[l]&0x80)		/* extended ASCII */
+							buf[l]=exascii_to_ascii_char(buf[l]);
+					}
 
 					fmsgbuf[f++]=buf[l]; }
 
@@ -3864,10 +3947,11 @@ int main(int argc, char **argv)
 	addrlist_t msg_seen,msg_path;
 	areasbbs_t fakearea,curarea;
 	char *usage="\n"
-	"usage: sbbsecho [cfg_file] [-switches] [sub_code]\n"
+	"usage: sbbsecho [cfg_file] [-switches] [sub_code] [address]\n"
 	"\n"
 	"where: cfg_file is the filename of config file (default is ctrl/sbbsecho.cfg)\n"
 	"       sub_code is the internal code for a sub-board (default is ALL subs)\n"
+	"       address is the link to export for (default is ALL links)\n"
 	"\n"
 	"valid switches:\n"
 	"\n"
@@ -3887,13 +3971,18 @@ int main(int argc, char **argv)
 
 	if((email=(smb_t *)malloc(sizeof(smb_t)))==NULL) {
 		printf("ERROR allocating memory for email.\n");
-		bail(1); }
+		bail(1); 
+		return -1;
+	}
 	memset(email,0,sizeof(smb_t));
 	if((smb=(smb_t *)malloc(MAX_OPEN_SMBS*sizeof(smb_t)))==NULL) {
 		printf("ERROR allocating memory for smbs.\n");
-		bail(1); }
+		bail(1); 
+		return -1;
+	}
 	for(i=0;i<MAX_OPEN_SMBS;i++)
 		memset(&smb[i],0,sizeof(smb_t));
+	memset(&addr,0,sizeof(addr));
 	memset(&cfg,0,sizeof(config_t));
 	memset(&hdr,0,sizeof(hdr));
 	memset(&pkt_faddr,0,sizeof(pkt_faddr));
@@ -3901,7 +3990,7 @@ int main(int argc, char **argv)
 	memset(&msg_path,0,sizeof(addrlist_t));
 	memset(&fakearea,0,sizeof(areasbbs_t));
 
-	sscanf("$Revision: 1.1.1.1 $", "%*s %s", revision);
+	sscanf("$Revision: 1.1.1.2 $", "%*s %s", revision);
 
 	DESCRIBE_COMPILER(compiler);
 
@@ -4000,14 +4089,21 @@ int main(int argc, char **argv)
 						bail(0);
 					default:
 						printf(usage);
-						bail(0); }
-				j++; } }
+						bail(0); 
+				}
+				j++; 
+			} 
+		}
 		else {
 			if(strchr(argv[i],'\\') || strchr(argv[i],'/') 
 				|| argv[i][1]==':' || strchr(argv[i],'.'))
 				SAFECOPY(cfg.cfgfile,argv[i]);
+			else if(isdigit(argv[i][0]))
+				addr=atofaddr(argv[i]);
 			else
-				SAFECOPY(sub_code,argv[i]); }  }
+				SAFECOPY(sub_code,argv[i]); 
+		}  
+	}
 
 	if(!(misc&(IMPORT_NETMAIL|IMPORT_ECHOMAIL)))
 		misc&=~IMPORT_PACKETS;
@@ -4015,7 +4111,9 @@ int main(int argc, char **argv)
 	p=getenv("SBBSCTRL");
 	if(p==NULL) {
 		printf("\7\nSBBSCTRL environment variable not set.\n");
-		bail(1); }
+		bail(1); 
+		return -1;
+	}
 	SAFECOPY(scfg.ctrl_dir,p); 
 
 	if(chdir(scfg.ctrl_dir)!=0)
@@ -4028,6 +4126,7 @@ int main(int argc, char **argv)
 		fprintf(stderr,"!ERROR %s\n",str);
 		fprintf(stderr,"!Failed to load configuration files\n");
 		bail(1);
+		return -1;
 	}
 
 	sprintf(str,"%stwitlist.cfg",scfg.ctrl_dir);
@@ -4048,6 +4147,7 @@ int main(int argc, char **argv)
 		if((fidologfile=fopen(cfg.logfile,"a"))==NULL) {
 			fprintf(stderr,"\7ERROR line %d opening %s\n",__LINE__,cfg.logfile);
 			bail(1); 
+			return -1;
 		}
 
 	/******* READ IN AREAS.BBS FILE *********/
@@ -4056,7 +4156,9 @@ int main(int argc, char **argv)
 	if((stream=fopen(cfg.areafile,"r"))==NULL) {
 		fprintf(stderr,"\nError opening %s for read: %s\n"
 			,cfg.areafile,strerror(errno));
-		bail(1); }
+		bail(1); 
+		return -1;
+	}
 	cfg.areas=0;		/* Total number of areas in AREAS.BBS */
 	cfg.area=NULL;
 	while(1) {
@@ -4070,7 +4172,9 @@ int main(int argc, char **argv)
 		if((cfg.area=(areasbbs_t *)realloc(cfg.area,sizeof(areasbbs_t)*
 			(cfg.areas+1)))==NULL) {
 			fprintf(stderr,"ERROR allocating memory for area #%u.\n",cfg.areas+1);
-			bail(1); }
+			bail(1); 
+			return -1;
+		}
 		memset(&cfg.area[cfg.areas],0,sizeof(areasbbs_t));
 
 		cfg.area[cfg.areas].sub=INVALID_SUB;	/* Default to passthru */
@@ -4098,7 +4202,9 @@ int main(int argc, char **argv)
 		if((cfg.area[cfg.areas].name=(char *)malloc(strlen(tmp)+1))==NULL) {
 			fprintf(stderr,"ERROR allocating memory for area #%u tag name.\n"
 				,cfg.areas+1);
-			bail(1); }
+			bail(1); 
+			return -1;
+		}
 		strcpy(cfg.area[cfg.areas].name,tmp);
 		strupr(tmp);
 		cfg.area[cfg.areas].tag=crc32(tmp,0);
@@ -4112,7 +4218,9 @@ int main(int argc, char **argv)
 				,sizeof(faddr_t)*(cfg.area[cfg.areas].uplinks+1)))==NULL) {
 				fprintf(stderr,"ERROR allocating memory for area #%u uplinks.\n"
 					,cfg.areas+1);
-				bail(1); }
+				bail(1); 
+				return -1;
+			}
 			cfg.area[cfg.areas].uplink[cfg.area[cfg.areas].uplinks]=atofaddr(p);
 			FIND_WHITESPACE(p);	/* Skip address */
 			SKIP_WHITESPACE(p);	/* Skip white space */
@@ -4128,6 +4236,7 @@ int main(int argc, char **argv)
 	if(!cfg.areas) {
 		lprintf(LOG_WARNING,"No areas defined!");
 		bail(1); 
+		return -1;
 	}
 
 	#if 0	/* AREAS.BBS DEBUG */
@@ -4153,7 +4262,7 @@ int main(int argc, char **argv)
 	glob(path,0,NULL,&g);
 	for(f=0;f<g.gl_pathc && !kbhit();f++) {
 
-		strcpy(packet,(char*)g.gl_pathv[f]);
+		SAFECOPY(packet,(char*)g.gl_pathv[f]);
 
 		lprintf(LOG_DEBUG,"%21s: %s ","Outbound Packet",packet);
 		if((fmsg=sopen(packet,O_RDWR|O_BINARY,SH_DENYRW))==-1) {
@@ -4232,7 +4341,7 @@ int main(int argc, char **argv)
 		glob(path,0,NULL,&g);
 		for(f=0;f<g.gl_pathc && !kbhit();f++) {
 
-			strcpy(packet,g.gl_pathv[f]);
+			SAFECOPY(packet,g.gl_pathv[f]);
 
 			if((fidomsg=fnopen(&fmsg,packet,O_RDWR))==NULL) {
 				lprintf(LOG_ERR,"ERROR line %d opening %s %s",__LINE__,packet
@@ -4241,7 +4350,7 @@ int main(int argc, char **argv)
 			}
 			if(filelength(fmsg)<sizeof(pkthdr_t)) {
 				lprintf(LOG_WARNING,"Invalid length of %s: %lu bytes"
-					,fmsg,filelength(fmsg));
+					,packet,filelength(fmsg));
 				fclose(fidomsg);
 				continue; 
 			}
@@ -4567,7 +4676,7 @@ int main(int argc, char **argv)
 					subnum[cur_smb]=cfg.area[i].sub;
 				}
 
-				if(hdr.attr&FIDO_PRIVATE && !(scfg.sub[cfg.area[i].sub]->misc&SUB_PRIV)) {
+				if((hdr.attr&FIDO_PRIVATE) && !(scfg.sub[cfg.area[i].sub]->misc&SUB_PRIV)) {
 					if(misc&IMPORT_PRIVATE)
 						hdr.attr&=~FIDO_PRIVATE;
 					else {
@@ -4611,7 +4720,8 @@ int main(int argc, char **argv)
 				if(j==0) {		/* Successful import */
 					echomail++;
 					cfg.area[i].imported++;
-					if(misc&NOTIFY_RECEIPT && (m=matchname(hdr.to))!=0) {
+					/* Should this check if the user has access to the echo in question? */
+					if(i!=cfg.badecho && misc&NOTIFY_RECEIPT && (m=matchname(hdr.to))!=0) {
 						sprintf(str
 						,"\7\1n\1hSBBSecho: \1m%.*s \1n\1msent you EchoMail on "
 							"\1h%s \1n\1m%s\1n\r\n"
@@ -4696,7 +4806,7 @@ int main(int argc, char **argv)
 		glob(str,0,NULL,&g);
 		for(f=0;f<g.gl_pathc && !kbhit();f++) {
 
-			strcpy(path,g.gl_pathv[f]);
+			SAFECOPY(path,g.gl_pathv[f]);
 
 			if((fidomsg=fnopen(&fmsg,path,O_RDWR))==NULL) {
 				lprintf(LOG_ERR,"ERROR line %d opening %s %s",__LINE__,path
@@ -4735,11 +4845,8 @@ int main(int argc, char **argv)
 	}
 
 
-	if(misc&EXPORT_ECHOMAIL) {
-		memset(&addr,0,sizeof(faddr_t));
+	if(misc&EXPORT_ECHOMAIL)
 		export_echomail(sub_code,addr);
-	}
-
 
 	if(misc&PACK_NETMAIL) {
 
@@ -4747,7 +4854,7 @@ int main(int argc, char **argv)
 		memset(&msg_path,0,sizeof(addrlist_t));
 		memset(&fakearea,0,sizeof(areasbbs_t));
 
-		lprintf(LOG_DEBUG,"\nPacking Outbound NetMail...");
+		lprintf(LOG_DEBUG,"\nPacking Outbound NetMail from %s",scfg.netmail_dir);
 
 #ifdef __unix__
 		sprintf(str,"%s*.[Mm][Ss][Gg]",scfg.netmail_dir);
@@ -4757,7 +4864,7 @@ int main(int argc, char **argv)
 		glob(str,0,NULL,&g);
 		for(f=0;f<g.gl_pathc && !kbhit();f++) {
 
-			strcpy(path,g.gl_pathv[f]);
+			SAFECOPY(path,g.gl_pathv[f]);
 
 			if((fidomsg=fnopen(&fmsg,path,O_RDWR))==NULL) {
 				lprintf(LOG_ERR,"ERROR line %d opening %s %s",__LINE__,path
@@ -4786,14 +4893,16 @@ int main(int argc, char **argv)
 				fclose(fidomsg);
 				continue;
 			}
-			printf("\n%s to %s ",path,smb_faddrtoa(&addr,NULL));
+			printf("\n%s to %s ",getfname(path),smb_faddrtoa(&addr,NULL));
 			if(cfg.log&LOG_PACKING)
 				logprintf("Packing %s (%s)",path,smb_faddrtoa(&addr,NULL));
 			fmsgbuf=getfmsg(fidomsg,NULL);
 			if(!fmsgbuf) {
 				lprintf(LOG_ERR,"ERROR line %d allocating memory for NetMail fmsgbuf"
 					,__LINE__);
-				bail(1); }
+				bail(1); 
+				return -1;
+			}
 			fclose(fidomsg);
 
 			attr=0;
@@ -4817,10 +4926,10 @@ int main(int argc, char **argv)
 				else if(attr&ATTR_HOLD) ch='h';
 				else if(attr&ATTR_DIRECT) ch='d';
 				else ch='o';
-				if(addr.zone==sys_faddr.zone) /* Default zone, use default outbound */
-					strcpy(outbound,cfg.outbound);
-				else {						 /* Inter-zone outbound is OUTBOUND.XXX */
-					sprintf(outbound,"%.*s.%03x"
+				if(addr.zone==sys_faddr.zone) { /* Default zone, use default outbound */
+					SAFECOPY(outbound,cfg.outbound);
+				} else {						 /* Inter-zone outbound is OUTBOUND.XXX */
+					SAFEPRINTF3(outbound,"%.*s.%03x"
 						,(int)strlen(cfg.outbound)-1,cfg.outbound,addr.zone);
 					MKDIR(outbound);
 					backslash(outbound);
@@ -4835,21 +4944,24 @@ int main(int argc, char **argv)
 				MKDIR(outbound);
 				backslash(outbound);
 				if(addr.point)
-					sprintf(packet,"%s%08x.%cut",outbound,addr.point,ch);
+					SAFEPRINTF3(packet,"%s%08x.%cut",outbound,addr.point,ch);
 				else
-					sprintf(packet,"%s%04x%04x.%cut",outbound,addr.net,addr.node,ch);
+					SAFEPRINTF4(packet,"%s%04x%04x.%cut",outbound,addr.net,addr.node,ch);
 				if(hdr.attr&FIDO_FILE)
 					if(write_flofile(hdr.subj,addr,FALSE /* !bundle */))
-						bail(1); }
+						bail(1); 
+			}
 			else
-				strcpy(packet,pktname(/* Temp? */ FALSE));
+				SAFECOPY(packet,pktname(/* Temp? */ FALSE));
 
+			lprintf(LOG_DEBUG,"NetMail packet: %s", packet);
 			now=time(NULL);
 			tm=localtime(&now);
 			if((stream=fnopen(&file,packet,O_RDWR|O_CREAT))==NULL) {
 				lprintf(LOG_ERR,"ERROR line %d opening %s %s",__LINE__,packet
 					,strerror(errno));
 				bail(1); 
+				return -1;
 			}
 
 			if(filelength(file) < sizeof(pkthdr_t)) {
@@ -4929,7 +5041,7 @@ int main(int argc, char **argv)
 						lprintf(LOG_ERR,"ERROR %d line %d opening/creating %s"
 							,errno,__LINE__,str); }
 					else {
-						write(file,&l,sizeof(time_t));
+						write(file,&l,4);
 						close(file); 
 					} 
 				}
@@ -4942,7 +5054,9 @@ int main(int argc, char **argv)
 		sprintf(str,"%ssbbsecho.msg",scfg.text_dir);
 		if((file=nopen(str,O_WRONLY|O_CREAT|O_TRUNC))==-1) {
 			lprintf(LOG_ERR,"ERROR line %d opening %s",__LINE__,str);
-			bail(1); }
+			bail(1); 
+			return -1;
+		}
 		sprintf(fname,"\1c\1h               "
 			"ÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜ\r\n");
 		sprintf(path,"\1c\1h               "