--- sbbs/src/sbbs3/qwk.cpp	2018/04/24 16:41:23	1.1
+++ sbbs/src/sbbs3/qwk.cpp	2018/04/24 16:43:40	1.1.1.2
@@ -2,13 +2,13 @@
 
 /* Synchronet QWK packet-related functions */
 
-/* $Id: qwk.cpp,v 1.1 2018/04/24 16:41:23 root Exp $ */
+/* $Id: qwk.cpp,v 1.1.1.2 2018/04/24 16:43:40 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 2005 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				*
@@ -63,10 +63,12 @@ bool route_circ(char *via, char *id)
 {
 	char str[256],*p,*sp;
 
-	strcpy(str,via);
+	if(via==NULL || id==NULL)
+		return(false);
+
+	SAFECOPY(str,via);
 	p=str;
-	while(*p && *p<=' ')
-		p++;
+	SKIP_WHITESPACE(p);
 	while(*p) {
 		sp=strchr(p,'/');
 		if(sp) *sp=0;
@@ -74,7 +76,8 @@ bool route_circ(char *via, char *id)
 			return(true);
 		if(!sp)
 			break;
-		p=sp+1; }
+		p=sp+1; 
+	}
 	return(false);
 }
 
@@ -97,14 +100,18 @@ int sbbs_t::qwk_route(char *inaddr, char
 			break;
 	if(i<cfg.total_qhubs) {
 		strcpy(fulladdr,node);
-		return(0); }
+		return(0); 
+	}
 
 	i=matchuser(&cfg,node,FALSE);			/* Check if destination is a node */
 	if(i) {
 		getuserrec(&cfg,i,U_REST,8,str);
 		if(ahtoul(str)&FLAG('Q')) {
 			strcpy(fulladdr,node);
-			return(i); } }
+			return(i); 
+		}
+		
+	}
 
 	sprintf(node,"%.8s",inaddr);            /* node = next hop */
 	p=strchr(node,'/');
@@ -118,14 +125,18 @@ int sbbs_t::qwk_route(char *inaddr, char
 				break;
 		if(i<cfg.total_qhubs) {
 			strcpy(fulladdr,inaddr);
-			return(0); }
+			return(0); 
+		}
 
 		i=matchuser(&cfg,node,FALSE);			/* Check if next hop is a node */
 		if(i) {
 			getuserrec(&cfg,i,U_REST,8,str);
 			if(ahtoul(str)&FLAG('Q')) {
 				strcpy(fulladdr,inaddr);
-				return(i); } } }
+				return(i); 
+			}
+		}
+	}
 
 	p=strchr(node,' ');
 	if(p) *p=0;
@@ -143,7 +154,10 @@ int sbbs_t::qwk_route(char *inaddr, char
 			fclose(stream);
 			truncsp(str);
 			sprintf(fulladdr,"%s/%s",str+9+strlen(node),inaddr);
-			break; } }
+			break; 
+		}
+		
+	}
 
 	fclose(stream);
 	if(!fulladdr[0])			/* First hop not found in ROUTE.DAT */
@@ -164,7 +178,8 @@ int sbbs_t::qwk_route(char *inaddr, char
 	if(i) {
 		getuserrec(&cfg,i,U_REST,8,str);
 		if(ahtoul(str)&FLAG('Q'))
-			return(i); }
+			return(i); 
+	}
 	fulladdr[0]=0;
 	return(0);
 }
@@ -194,23 +209,29 @@ void sbbs_t::update_qwkroute(char *via)
 				if(qwk_time[i]>t)
 					fprintf(stream,"%s %s:%s\r\n"
 						,unixtodstr(&cfg,qwk_time[i],str),qwk_node[i],qwk_path[i]);
-			fclose(stream); }
+			fclose(stream); 
+		}
 		else
 			errormsg(WHERE,ERR_OPEN,str,O_WRONLY|O_CREAT|O_TRUNC);
 		for(i=0;i<total_nodes;i++) {
 			free(qwk_node[i]);
-			free(qwk_path[i]); }
+			free(qwk_path[i]); 
+		}
 		if(qwk_node) {
 			free(qwk_node);
-			qwk_node=NULL; }
+			qwk_node=NULL; 
+		}
 		if(qwk_path) {
 			free(qwk_path);
-			qwk_path=NULL; }
+			qwk_path=NULL; 
+		}
 		if(qwk_time) {
 			free(qwk_time);
-			qwk_time=NULL; }
+			qwk_time=NULL; 
+		}
 		total_nodes=0;
-		return; }
+		return; 
+	}
 
 	if(!total_nodes) {
 		sprintf(str,"%sqnet/route.dat",cfg.data_dir);
@@ -234,26 +255,36 @@ void sbbs_t::update_qwkroute(char *via)
 				if(i==total_nodes) {
 					if((qwk_node=(char **)realloc(qwk_node,sizeof(char *)*(i+1)))==NULL) {
 						errormsg(WHERE,ERR_ALLOC,str,9*(i+1));
-						break; }
+						break; 
+					}
 					if((qwk_path=(char **)realloc(qwk_path,sizeof(char *)*(i+1)))==NULL) {
 						errormsg(WHERE,ERR_ALLOC,str,sizeof(char*)*(i+1));
-						break; }
+						break; 
+					}
 					if((qwk_time=(time_t *)realloc(qwk_time,sizeof(time_t)*(i+1)))==NULL) {
 						errormsg(WHERE,ERR_ALLOC,str,sizeof(time_t)*(i+1));
-						break; }
+						break; 
+					}
 					if((qwk_node[i]=(char *)malloc(9))==NULL) {
 						errormsg(WHERE,ERR_ALLOC,str,9);
-						break; }
+						break; 
+					}
 					if((qwk_path[i]=(char *)malloc(MAX_PATH+1))==NULL) {
 						errormsg(WHERE,ERR_ALLOC,str,MAX_PATH+1);
-						break; }
-					total_nodes++; }
+						break; 
+					}
+					total_nodes++; 
+				}
 				strcpy(qwk_node[i],node);
 				p++;
 				while(*p && *p<=' ') p++;
 				sprintf(qwk_path[i],"%.127s",p);
-				qwk_time[i]=t; }
-			fclose(stream); } }
+				qwk_time[i]=t; 
+			}
+			fclose(stream); 
+		}
+		
+	}
 
 	strupr(via);
 	p=strchr(via,'/');   /* Skip uplink */
@@ -272,25 +303,32 @@ void sbbs_t::update_qwkroute(char *via)
 		if(i==total_nodes) {		/* Not in list */
 			if((qwk_node=(char **)realloc(qwk_node,sizeof(char *)*(total_nodes+1)))==NULL) {
 				errormsg(WHERE,ERR_ALLOC,str,9*(total_nodes+1));
-				break; }
+				break; 
+			}
 			if((qwk_path=(char **)realloc(qwk_path,sizeof(char *)*(total_nodes+1)))==NULL) {
 				errormsg(WHERE,ERR_ALLOC,str,sizeof(char *)*(total_nodes+1));
-				break; }
+				break; 
+			}
 			if((qwk_time=(time_t *)realloc(qwk_time,sizeof(time_t)*(total_nodes+1)))
 				==NULL) {
 				errormsg(WHERE,ERR_ALLOC,str,sizeof(time_t)*(total_nodes+1));
-				break; }
+				break; 
+			}
 			if((qwk_node[total_nodes]=(char *)malloc(9))==NULL) {
 				errormsg(WHERE,ERR_ALLOC,str,9);
-				break; }
+				break; 
+			}
 			if((qwk_path[total_nodes]=(char *)malloc(MAX_PATH+1))==NULL) {
 				errormsg(WHERE,ERR_ALLOC,str,MAX_PATH+1);
-				break; }
-			total_nodes++; }
+				break; 
+			}
+			total_nodes++; 
+		}
 		sprintf(qwk_node[i],"%.8s",node);
 		sprintf(qwk_path[i],"%.*s",(int)((p-1)-via),via);
 		qwk_time[i]=time(NULL);
-		p=strchr(p,'/'); }
+		p=strchr(p,'/'); 
+	}
 	}
 
 /****************************************************************************/
@@ -300,13 +338,16 @@ void sbbs_t::qwk_success(ulong msgcnt, c
 {
 	char	str[MAX_PATH+1];
 	int 	i;
-	long	l,msgs,deleted=0;
+	long	l,deleted=0;
+	int32_t	msgs;
 	mail_t	*mail;
 	smbmsg_t msg;
 
 	if(useron.rest&FLAG('Q')) {	// Was if(!prepack) only
-		sprintf(str,"%sqnet/%.8s.out/",cfg.data_dir,useron.alias);
-		strlwr(str);
+		char id[LEN_QWKID+1];
+		SAFECOPY(id,useron.alias);
+		strlwr(id);
+		sprintf(str,"%sqnet/%s.out/",cfg.data_dir,id);
 		delfiles(str,ALLFILES); 
 	}
 
@@ -321,7 +362,10 @@ void sbbs_t::qwk_success(ulong msgcnt, c
 
 		if(!bi) {
 			batch_download(-1);
-			delfiles(cfg.temp_dir,ALLFILES); } }
+			delfiles(cfg.temp_dir,ALLFILES); 
+		}
+		
+	}
 
 	if(useron.rest&FLAG('Q'))
 		useron.qwk|=(QWK_EMAIL|QWK_ALLMAIL|QWK_DELMAIL);
@@ -331,7 +375,8 @@ void sbbs_t::qwk_success(ulong msgcnt, c
 		smb.subnum=INVALID_SUB;
 		if((i=smb_open(&smb))!=0) {
 			errormsg(WHERE,ERR_OPEN,smb.file,i,smb.last_error);
-			return; }
+			return; 
+		}
 
 		mail=loadmail(&smb,&msgs,useron.number,0
 			,useron.qwk&QWK_ALLMAIL ? 0 : LM_UNREAD);
@@ -341,14 +386,16 @@ void sbbs_t::qwk_success(ulong msgcnt, c
 				free(mail);
 			smb_close(&smb);
 			errormsg(WHERE,ERR_LOCK,smb.file,i,smb.last_error);	/* messes with the index */
-			return; }
+			return; 
+		}
 
 		if((i=smb_getstatus(&smb))!=0) {
 			if(msgs)
 				free(mail);
 			smb_close(&smb);
 			errormsg(WHERE,ERR_READ,smb.file,i,smb.last_error);
-			return; }
+			return; 
+		}
 
 		/* Mark as READ and DELETE */
 		for(l=0;l<msgs;l++) {
@@ -363,24 +410,28 @@ void sbbs_t::qwk_success(ulong msgcnt, c
 					telluser(&msg);
 				msg.hdr.attr|=MSG_READ;
 				msg.idx.attr=msg.hdr.attr;
-				smb_putmsg(&smb,&msg); }
+				smb_putmsg(&smb,&msg); 
+			}
 			if(!(msg.hdr.attr&MSG_PERMANENT)
-				&& ((msg.hdr.attr&MSG_KILLREAD && msg.hdr.attr&MSG_READ)
+				&& (((msg.hdr.attr&MSG_KILLREAD) && (msg.hdr.attr&MSG_READ))
 				|| (useron.qwk&QWK_DELMAIL))) {
 				msg.hdr.attr|=MSG_DELETE;
 				msg.idx.attr=msg.hdr.attr;
 				if((i=smb_putmsg(&smb,&msg))!=0)
 					errormsg(WHERE,ERR_WRITE,smb.file,i,smb.last_error);
 				else
-					deleted++; }
+					deleted++; 
+			}
 			smb_freemsgmem(&msg);
-			smb_unlockmsghdr(&smb,&msg); }
+			smb_unlockmsghdr(&smb,&msg); 
+		}
 
 		if(deleted && cfg.sys_misc&SM_DELEMAIL)
 			delmail(useron.number,MAIL_YOUR);
 		smb_close(&smb);
 		if(msgs)
-			free(mail); }
+			free(mail); 
+	}
 
 }
 
@@ -394,6 +445,7 @@ void sbbs_t::qwk_sec()
 	int		error;
 	int 	s;
 	uint	i,k;
+	ulong	l;
 	ulong	msgcnt;
 	ulong	*sav_ptr;
 	file_t	fd;
@@ -403,11 +455,12 @@ void sbbs_t::qwk_sec()
 	fd.dir=cfg.total_dirs;
 	if((sav_ptr=(ulong *)malloc(sizeof(ulong)*cfg.total_subs))==NULL) {
 		errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(ulong)*cfg.total_subs);
-		return; }
+		return; 
+	}
 	for(i=0;i<cfg.total_subs;i++)
 		sav_ptr[i]=subscan[i].ptr;
 	for(i=0;i<cfg.total_prots;i++)
-		if(cfg.prot[i]->bicmd[0] && chk_ar(cfg.prot[i]->ar,&useron))
+		if(cfg.prot[i]->bicmd[0] && chk_ar(cfg.prot[i]->ar,&useron,&client))
 			bi++;				/* number of bidirectional protocols configured */
 	if(useron.rest&FLAG('Q'))
 		getusrsubs();
@@ -432,65 +485,58 @@ void sbbs_t::qwk_sec()
 				&& !(useron.rest&FLAG('Q')))
 				continue;
 			menu("qwk");
-			continue; }
+			continue; 
+		}
 		if(ch=='S') {
 			new_scan_cfg(SUB_CFG_NSCAN);
 			delfiles(cfg.temp_dir,ALLFILES);
-			continue; }
+			continue; 
+		}
 		if(ch=='P') {
 			new_scan_ptr_cfg();
 			for(i=0;i<cfg.total_subs;i++)
 				sav_ptr[i]=subscan[i].ptr;
 			delfiles(cfg.temp_dir,ALLFILES);
-			continue; }
+			continue; 
+		}
 		if(ch=='C') {
 			while(online) {
 				CLS;
-				bputs("\1n\1gQWK Settings:\1n\r\n\r\n");
-				bprintf("\1hA\1n) %-30s: \1h%s\r\n"
-					,"Ctrl-A Color Codes"
+				bprintf(text[QWKSettingsHdr],useron.alias,useron.number);
+				bprintf(text[QWKSettingsCtrlA]
 					,useron.qwk&QWK_EXPCTLA
 					? "Expand to ANSI" : useron.qwk&QWK_RETCTLA ? "Leave in"
 					: "Strip");
-				bprintf("\1hT\1n) %-30s: \1h%s\r\n"
-					,"Archive Type"
-					,useron.tmpext);
-				bprintf("\1hE\1n) %-30s: \1h%s\r\n"
-					,"Include E-mail Messages"
+				bprintf(text[QWKSettingsArchive],useron.tmpext);
+				bprintf(text[QWKSettingsEmail]
 					,useron.qwk&QWK_EMAIL ? "Un-read Only"
 					: useron.qwk&QWK_ALLMAIL ? text[Yes] : text[No]);
-				bprintf("\1hI\1n) %-30s: \1h%s\r\n"
-					,"Include File Attachments"
-					,useron.qwk&QWK_ATTACH ? text[Yes] : text[No]);
-				bprintf("\1hD\1n) %-30s: \1h%s\r\n"
-					,"Delete E-mail Automatically"
-					,useron.qwk&QWK_DELMAIL ? text[Yes]:text[No]);
-				bprintf("\1hF\1n) %-30s: \1h%s\r\n"
-					,"Include New Files List"
+				if(useron.qwk&(QWK_ALLMAIL|QWK_EMAIL)) {
+					bprintf(text[QWKSettingsAttach]
+						,useron.qwk&QWK_ATTACH ? text[Yes] : text[No]);
+					bprintf(text[QWKSettingsDeleteEmail]
+						,useron.qwk&QWK_DELMAIL ? text[Yes]:text[No]);
+				}
+				bprintf(text[QWKSettingsNewFilesList]
 					,useron.qwk&QWK_FILES ? text[Yes]:text[No]);
-				bprintf("\1hN\1n) %-30s: \1h%s\r\n"
-					,"Include Index Files"
+				bprintf(text[QWKSettingsIndex]
 					,useron.qwk&QWK_NOINDEX ? text[No]:text[Yes]);
-				bprintf("\1hC\1n) %-30s: \1h%s\r\n"
-					,"Include Control Files"
+				bprintf(text[QWKSettingsControl]
 					,useron.qwk&QWK_NOCTRL ? text[No]:text[Yes]);
-				bprintf("\1hY\1n) %-30s: \1h%s\r\n"
-					,"Include Messages from You"
+				bprintf(text[QWKSettingsHeaders]
+					,useron.qwk&QWK_HEADERS ? text[Yes]:text[No]);
+				bprintf(text[QWKSettingsBySelf]
 					,useron.qwk&QWK_BYSELF ? text[Yes]:text[No]);
-				bprintf("\1hZ\1n) %-30s: \1h%s\r\n"
-					,"Include Time Zone (TZ)"
+				bprintf(text[QWKSettingsTimeZone]
 					,useron.qwk&QWK_TZ ? text[Yes]:text[No]);
-				bprintf("\1hV\1n) %-30s: \1h%s\1n\r\n"
-					,"Include Message Path (VIA)"
+				bprintf(text[QWKSettingsVIA]
 					,useron.qwk&QWK_VIA ? text[Yes]:text[No]);
-				bprintf("\1hM\1n) %-30s: \1h%s\1n\r\n"
-					,"Include Message/Reply IDs"
+				bprintf(text[QWKSettingsMsgID]
 					,useron.qwk&QWK_MSGID ? text[Yes]:text[No]);
-				bprintf("\1hX\1n) %-30s: \1h%s\1n\r\n"
-					,"Extended (QWKE) Packet Format"
+				bprintf(text[QWKSettingsExtended]
 					,useron.qwk&QWK_EXT ? text[Yes]:text[No]);
-				bputs(text[UserDefaultsWhich]);
-				ch=(char)getkeys("AEDFIOQTYMNCXZV",0);
+				bputs(text[QWKSettingsWhich]);
+				ch=(char)getkeys("AEDFHIOQTYMNCXZV",0);
 				if(sys_status&SS_ABORT || !ch || ch=='Q' || !online)
 					break;
 				switch(ch) {
@@ -499,27 +545,33 @@ void sbbs_t::qwk_sec()
 							useron.qwk|=QWK_EXPCTLA;
 						else if(useron.qwk&QWK_EXPCTLA) {
 							useron.qwk&=~QWK_EXPCTLA;
-							useron.qwk|=QWK_RETCTLA; }
+							useron.qwk|=QWK_RETCTLA; 
+						}
 						else
 							useron.qwk&=~(QWK_EXPCTLA|QWK_RETCTLA);
 						break;
 					case 'T':
 						for(i=0;i<cfg.total_fcomps;i++)
-							uselect(1,i,"Archive Types",cfg.fcomp[i]->ext,cfg.fcomp[i]->ar);
+							uselect(1,i,text[ArchiveTypeHeading],cfg.fcomp[i]->ext,cfg.fcomp[i]->ar);
 						s=uselect(0,0,0,0,0);
 						if(s>=0) {
 							strcpy(useron.tmpext,cfg.fcomp[s]->ext);
-							putuserrec(&cfg,useron.number,U_TMPEXT,3,useron.tmpext); }
+							putuserrec(&cfg,useron.number,U_TMPEXT,3,useron.tmpext); 
+						}
 						break;
 					case 'E':
 						if(!(useron.qwk&(QWK_EMAIL|QWK_ALLMAIL)))
 							useron.qwk|=QWK_EMAIL;
 						else if(useron.qwk&QWK_EMAIL) {
 							useron.qwk&=~QWK_EMAIL;
-							useron.qwk|=QWK_ALLMAIL; }
+							useron.qwk|=QWK_ALLMAIL; 
+						}
 						else
 							useron.qwk&=~(QWK_EMAIL|QWK_ALLMAIL);
 						break;
+					case 'H':
+						useron.qwk^=QWK_HEADERS;
+						break;
 					case 'I':
 						useron.qwk^=QWK_ATTACH;
 						break;
@@ -551,9 +603,11 @@ void sbbs_t::qwk_sec()
 						useron.qwk^=QWK_EXT;
 						break;
 				}
-				putuserrec(&cfg,useron.number,U_QWK,8,ultoa(useron.qwk,str,16)); }
+				putuserrec(&cfg,useron.number,U_QWK,8,ultoa(useron.qwk,str,16)); 
+			}
 			delfiles(cfg.temp_dir,ALLFILES);
-			continue; }
+			continue; 
+		}
 
 
 		if(ch=='B') {   /* Bidirectional QWK and REP packet transfer */
@@ -563,24 +617,27 @@ void sbbs_t::qwk_sec()
 					subscan[i].ptr=sav_ptr[i];
 				remove(str);
 				last_ns_time=ns_time;
-				continue; }
+				continue; 
+			}
 			bprintf(text[UploadingREP],cfg.sys_id);
 			xfer_prot_menu(XFER_BIDIR);
 			mnemonics(text[ProtocolOrQuit]);
 			strcpy(tmp2,"Q");
 			for(i=0;i<cfg.total_prots;i++)
-				if(cfg.prot[i]->bicmd[0] && chk_ar(cfg.prot[i]->ar,&useron)) {
+				if(cfg.prot[i]->bicmd[0] && chk_ar(cfg.prot[i]->ar,&useron,&client)) {
 					sprintf(tmp,"%c",cfg.prot[i]->mnemonic);
-					strcat(tmp2,tmp); }
+					strcat(tmp2,tmp); 
+				}
 			ch=(char)getkeys(tmp2,0);
 			if(ch=='Q' || sys_status&SS_ABORT || !online) {
 				for(i=0;i<cfg.total_subs;i++)
 					subscan[i].ptr=sav_ptr[i];	/* re-load saved pointers */
 				last_ns_time=ns_time;
-				continue; }
+				continue; 
+			}
 			for(i=0;i<cfg.total_prots;i++)
 				if(cfg.prot[i]->bicmd[0] && cfg.prot[i]->mnemonic==ch
-					&& chk_ar(cfg.prot[i]->ar,&useron))
+					&& chk_ar(cfg.prot[i]->ar,&useron,&client))
 					break;
 			if(i<cfg.total_prots) {
 				batup_total=1;
@@ -593,7 +650,8 @@ void sbbs_t::qwk_sec()
 					|| !create_batchup_lst()
 					|| !create_bimodem_pth()) {
 					batup_total=batdn_total=0;
-					continue; }
+					continue; 
+				}
 				sprintf(str,"%s%s.qwk",cfg.temp_dir,cfg.sys_id);
 				sprintf(tmp2,"%s.qwk",cfg.sys_id);
 				padfname(tmp2,fd.name);
@@ -621,7 +679,10 @@ void sbbs_t::qwk_sec()
 			else {
 				last_ns_time=ns_time;
 				for(i=0;i<cfg.total_subs;i++)
-					subscan[i].ptr=sav_ptr[i]; } }
+					subscan[i].ptr=sav_ptr[i]; 
+			}
+			
+		}
 
 		else if(ch=='D') {   /* Download QWK Packet of new messages */
 			sprintf(str,"%s%s.qwk",cfg.temp_dir,cfg.sys_id);
@@ -630,40 +691,22 @@ void sbbs_t::qwk_sec()
 					subscan[i].ptr=sav_ptr[i];
 				last_ns_time=ns_time;
 				remove(str);
-				continue; }
-#if 0	/* no such thing as local logon */
-			if(online==ON_LOCAL) {			/* Local QWK packet creation */
-				bputs(text[EnterPath]);
-				if(!getstr(str,60,K_LINE|K_UPPER)) {
-					for(i=0;i<cfg.total_subs;i++)
-						subscan[i].ptr=sav_ptr[i];   /* re-load saved pointers */
-					last_ns_time=ns_time;
-					continue; }
-				backslashcolon(str);
-				sprintf(tmp2,"%s%s.qwk",str,cfg.sys_id);
-				if(fexistcase(tmp2)) {
-					for(i=0;i<10;i++) {
-						sprintf(tmp2,"%s%s.qw%d",str,cfg.sys_id,i);
-						if(!fexistcase(tmp2))
-							break; }
-					if(i==10) {
-						bputs(text[FileAlreadyThere]);
-						last_ns_time=ns_time;
-						for(i=0;i<cfg.total_subs;i++)
-							subscan[i].ptr=sav_ptr[i];
-						continue; } }
-				sprintf(tmp,"%s%s.qwk",cfg.temp_dir,cfg.sys_id);
-				if(mv(tmp,tmp2,0)) { /* unsuccessful */
-					for(i=0;i<cfg.total_subs;i++)
-						subscan[i].ptr=sav_ptr[i];
-					last_ns_time=ns_time; }
-				else {
-					bprintf(text[FileNBytesSent],tmp2,ultoac(flength(tmp2),tmp));
-					qwk_success(msgcnt,0,0);
-					for(i=0;i<cfg.total_subs;i++)
-						sav_ptr[i]=subscan[i].ptr; }
-				continue; }
-#endif
+				continue; 
+			}
+
+			l=(long)flength(str);
+			bprintf(text[FiFilename],getfname(str));
+			bprintf(text[FiFileSize],ultoac(l,tmp));
+			if(l>0L && cur_cps)
+				i=l/(ulong)cur_cps;
+			else
+				i=0;
+			bprintf(text[FiTransferTime],sectostr(i,tmp));
+			CRLF;
+			if(!(useron.exempt&FLAG('T')) && i>timeleft) {
+				bputs(text[NotEnoughTimeToDl]);
+				break; 
+			}
 			/***************/
 			/* Send Packet */
 			/***************/
@@ -671,19 +714,21 @@ void sbbs_t::qwk_sec()
 			mnemonics(text[ProtocolOrQuit]);
 			strcpy(tmp2,"Q");
 			for(i=0;i<cfg.total_prots;i++)
-				if(cfg.prot[i]->dlcmd[0] && chk_ar(cfg.prot[i]->ar,&useron)) {
+				if(cfg.prot[i]->dlcmd[0] && chk_ar(cfg.prot[i]->ar,&useron,&client)) {
 					sprintf(tmp,"%c",cfg.prot[i]->mnemonic);
-					strcat(tmp2,tmp); }
+					strcat(tmp2,tmp); 
+				}
 			ungetkey(useron.prot);
 			ch=(char)getkeys(tmp2,0);
 			if(ch=='Q' || sys_status&SS_ABORT || !online) {
 				for(i=0;i<cfg.total_subs;i++)
 					subscan[i].ptr=sav_ptr[i];   /* re-load saved pointers */
 				last_ns_time=ns_time;
-				continue; }
+				continue; 
+			}
 			for(i=0;i<cfg.total_prots;i++)
 				if(cfg.prot[i]->dlcmd[0] && cfg.prot[i]->mnemonic==ch
-					&& chk_ar(cfg.prot[i]->ar,&useron))
+					&& chk_ar(cfg.prot[i]->ar,&useron,&client))
 					break;
 			if(i<cfg.total_prots) {
 				sprintf(str,"%s%s.qwk",cfg.temp_dir,cfg.sys_id);
@@ -712,34 +757,21 @@ void sbbs_t::qwk_sec()
 	/*
 			if(useron.rest&FLAG('Q') && useron.rest&FLAG('P')) {
 				bputs(text[R_Post]);
-				continue; }
+				continue; 
+				}
 	*/
 
 			delfiles(cfg.temp_dir,ALLFILES);
 			bprintf(text[UploadingREP],cfg.sys_id);
 			for(k=0;k<cfg.total_fextrs;k++)
 				if(!stricmp(cfg.fextr[k]->ext,useron.tmpext)
-					&& chk_ar(cfg.fextr[k]->ar,&useron))
+					&& chk_ar(cfg.fextr[k]->ar,&useron,&client))
 					break;
 			if(k>=cfg.total_fextrs) {
 				bputs(text[QWKExtractionFailed]);
-				errorlog("Couldn't extract REP packet - configuration error");
-				continue; }
-
-#if 0	/* no such thing as local logon */
-			if(online==ON_LOCAL) {		/* Local upload of rep packet */
-				bputs(text[EnterPath]);
-				if(!getstr(str,60,K_LINE|K_UPPER))
-					continue;
-				backslashcolon(str);
-				sprintf(tmp,"%s.rep",cfg.sys_id);
-				strcat(str,tmp);
-				sprintf(tmp,"%s%s.rep",cfg.temp_dir,cfg.sys_id);
-				if(!mv(str,tmp,0))
-					unpack_rep();
-				delfiles(cfg.temp_dir,ALLFILES);
-				continue; }
-#endif
+				lprintf(LOG_ERR, "Couldn't extract REP packet - configuration error");
+				continue; 
+			}
 
 			/******************/
 			/* Receive Packet */
@@ -748,15 +780,16 @@ void sbbs_t::qwk_sec()
 			mnemonics(text[ProtocolOrQuit]);
 			strcpy(tmp2,"Q");
 			for(i=0;i<cfg.total_prots;i++)
-				if(cfg.prot[i]->ulcmd[0] && chk_ar(cfg.prot[i]->ar,&useron)) {
+				if(cfg.prot[i]->ulcmd[0] && chk_ar(cfg.prot[i]->ar,&useron,&client)) {
 					sprintf(tmp,"%c",cfg.prot[i]->mnemonic);
-					strcat(tmp2,tmp); }
+					strcat(tmp2,tmp); 
+				}
 			ch=(char)getkeys(tmp2,0);
 			if(ch=='Q' || sys_status&SS_ABORT || !online)
 				continue;
 			for(i=0;i<cfg.total_prots;i++)
 				if(cfg.prot[i]->ulcmd[0] && cfg.prot[i]->mnemonic==ch
-					&& chk_ar(cfg.prot[i]->ar,&useron))
+					&& chk_ar(cfg.prot[i]->ar,&useron,&client))
 					break;
 			if(i>=cfg.total_prots)	/* This shouldn't happen */
 				continue;
@@ -765,7 +798,8 @@ void sbbs_t::qwk_sec()
 			unpack_rep();
 			delfiles(cfg.temp_dir,ALLFILES);
 			//autohangup();
-			} }
+		} 
+	}
 	delfiles(cfg.temp_dir,ALLFILES);
 	free(sav_ptr);
 }
@@ -773,23 +807,25 @@ void sbbs_t::qwk_sec()
 void sbbs_t::qwksetptr(uint subnum, char *buf, int reset)
 {
 	long	l;
-	ulong	last;
+	uint32_t	last;
 
 	if(buf[2]=='/' && buf[5]=='/') {    /* date specified */
 		l=dstrtounix(&cfg,buf);
 		subscan[subnum].ptr=getmsgnum(subnum,l);
-		return; }
+		return; 
+	}
 	l=atol(buf);
 	if(l>=0)							  /* ptr specified */
 		subscan[subnum].ptr=l;
 	else if(l) {						  /* relative ptr specified */
-		getlastmsg(subnum,&last,0);
+		getlastmsg(subnum,&last,/* time_t* */NULL);
 		if(-l>(long)last)
 			subscan[subnum].ptr=0;
 		else
-			subscan[subnum].ptr=last+l; }
+			subscan[subnum].ptr=last+l; 
+	}
 	else if(reset)
-		getlastmsg(subnum,&(subscan[subnum].ptr),0);
+		getlastmsg(subnum,&(subscan[subnum].ptr),/* time_t* */NULL);
 }
 
 
@@ -805,7 +841,7 @@ void sbbs_t::qwkcfgline(char *buf,uint s
 	ulong	qwk=useron.qwk;
 	file_t	f;
 
-	sprintf(str,"%.25s",buf);
+	sprintf(str,"%-25.25s",buf);	/* Note: must be space-padded, left justified */
 	strupr(str);
 	bprintf("\1n\r\n\1b\1hQWK Control [\1c%s\1b]: \1g%s\r\n"
 		,subnum==INVALID_SUB ? "Mail":cfg.sub[subnum]->qwkname,str);
@@ -822,125 +858,151 @@ void sbbs_t::qwkcfgline(char *buf,uint s
 				if(x>=usrgrps || y>=usrsubs[x]) {
 					bprintf(text[QWKInvalidConferenceN],l);
 					sprintf(str,"Invalid conference number %lu",l);
-					logline("Q!",str); }
+					logline(LOG_NOTICE,"Q!",str); 
+				}
 				else
-					subscan[usrsub[x][y]].cfg&=~SUB_CFG_NSCAN; }
-			return; }
+					subscan[usrsub[x][y]].cfg&=~SUB_CFG_NSCAN; 
+			}
+			return; 
+		}
 
 		if(!strncmp(str,"ADD YOURS ",10)) {               /* Add to new-scan */
 			subscan[subnum].cfg|=(SUB_CFG_NSCAN|SUB_CFG_YSCAN);
 			qwksetptr(subnum,str+10,0);
-			return; }
+			return; 
+		}
 
 		else if(!strncmp(str,"YOURS ",6)) {
 			subscan[subnum].cfg|=(SUB_CFG_NSCAN|SUB_CFG_YSCAN);
 			qwksetptr(subnum,str+6,0);
-			return; }
+			return; 
+		}
 
 		else if(!strncmp(str,"ADD ",4)) {               /* Add to new-scan */
 			subscan[subnum].cfg|=SUB_CFG_NSCAN;
 			subscan[subnum].cfg&=~SUB_CFG_YSCAN;
 			qwksetptr(subnum,str+4,0);
-			return; }
+			return; 
+		}
 
 		if(!strncmp(str,"RESET ",6)) {             /* set msgptr */
 			qwksetptr(subnum,str+6,1);
-			return; }
+			return; 
+		}
 
 		if(!strncmp(str,"SUBPTR ",7)) {
 			qwksetptr(subnum,str+7,1);
-			return; }
+			return; 
+		}
 		}
 
 	if(!strncmp(str,"RESETALL ",9)) {              /* set all ptrs */
 		for(x=y=0;x<usrgrps;x++)
 			for(y=0;y<usrsubs[x];y++)
 				if(subscan[usrsub[x][y]].cfg&SUB_CFG_NSCAN)
-					qwksetptr(usrsub[x][y],str+9,1); }
+					qwksetptr(usrsub[x][y],str+9,1); 
+	}
 
 	else if(!strncmp(str,"ALLPTR ",7)) {              /* set all ptrs */
 		for(x=y=0;x<usrgrps;x++)
 			for(y=0;y<usrsubs[x];y++)
 				if(subscan[usrsub[x][y]].cfg&SUB_CFG_NSCAN)
-					qwksetptr(usrsub[x][y],str+7,1); }
+					qwksetptr(usrsub[x][y],str+7,1); 
+	}
 
 	else if(!strncmp(str,"FILES ",6)) {                 /* files list */
 		if(!strncmp(str+6,"ON ",3))
 			useron.qwk|=QWK_FILES;
 		else if(str[8]=='/' && str[11]=='/') {      /* set scan date */
 			useron.qwk|=QWK_FILES;
-			ns_time=dstrtounix(&cfg,str+6); }
+			ns_time=dstrtounix(&cfg,str+6); 
+		}
 		else
-			useron.qwk&=~QWK_FILES; }
+			useron.qwk&=~QWK_FILES; 
+	}
 
 	else if(!strncmp(str,"OWN ",4)) {                   /* message from you */
 		if(!strncmp(str+4,"ON ",3))
 			useron.qwk|=QWK_BYSELF;
 		else
 			useron.qwk&=~QWK_BYSELF;
-		return; }
+		return; 
+	}
 
 	else if(!strncmp(str,"NDX ",4)) {                   /* include indexes */
 		if(!strncmp(str+4,"OFF ",4))
 			useron.qwk|=QWK_NOINDEX;
 		else
-			useron.qwk&=~QWK_NOINDEX; }
+			useron.qwk&=~QWK_NOINDEX; 
+	}
 
 	else if(!strncmp(str,"CONTROL ",8)) {               /* exclude ctrl files */
 		if(!strncmp(str+8,"OFF ",4))
 			useron.qwk|=QWK_NOCTRL;
 		else
-			useron.qwk&=~QWK_NOCTRL; }
+			useron.qwk&=~QWK_NOCTRL; 
+	}
 
 	else if(!strncmp(str,"VIA ",4)) {                   /* include @VIA: */
 		if(!strncmp(str+4,"ON ",3))
 			useron.qwk|=QWK_VIA;
 		else
-			useron.qwk&=~QWK_VIA; }
+			useron.qwk&=~QWK_VIA; 
+	}
 
 	else if(!strncmp(str,"MSGID ",6)) {                 /* include @MSGID: */
 		if(!strncmp(str+6,"ON ",3))
 			useron.qwk|=QWK_MSGID;
 		else
-			useron.qwk&=~QWK_MSGID; }
+			useron.qwk&=~QWK_MSGID; 
+	}
 
 	else if(!strncmp(str,"TZ ",3)) {                    /* include @TZ: */
 		if(!strncmp(str+3,"ON ",3))
 			useron.qwk|=QWK_TZ;
 		else
-			useron.qwk&=~QWK_TZ; }
+			useron.qwk&=~QWK_TZ; 
+	}
 
 	else if(!strncmp(str,"ATTACH ",7)) {                /* file attachments */
 		if(!strncmp(str+7,"ON ",3))
 			useron.qwk|=QWK_ATTACH;
 		else
-			useron.qwk&=~QWK_ATTACH; }
+			useron.qwk&=~QWK_ATTACH; 
+	}
 
 	else if(!strncmp(str,"DELMAIL ",8)) {               /* delete mail */
 		if(!strncmp(str+8,"ON ",3))
 			useron.qwk|=QWK_DELMAIL;
 		else
-			useron.qwk&=~QWK_DELMAIL; }
+			useron.qwk&=~QWK_DELMAIL; 
+	}
 
 	else if(!strncmp(str,"CTRL-A ",7)) {                /* Ctrl-a codes  */
 		if(!strncmp(str+7,"KEEP ",5)) {
 			useron.qwk|=QWK_RETCTLA;
-			useron.qwk&=~QWK_EXPCTLA; }
+			useron.qwk&=~QWK_EXPCTLA; 
+		}
 		else if(!strncmp(str+7,"EXPAND ",7)) {
 			useron.qwk|=QWK_EXPCTLA;
-			useron.qwk&=~QWK_RETCTLA; }
+			useron.qwk&=~QWK_RETCTLA; 
+		}
 		else
-			useron.qwk&=~(QWK_EXPCTLA|QWK_RETCTLA); }
+			useron.qwk&=~(QWK_EXPCTLA|QWK_RETCTLA); 
+	}
 
 	else if(!strncmp(str,"MAIL ",5)) {                  /* include e-mail */
 		if(!strncmp(str+5,"ALL ",4)) {
 			useron.qwk|=QWK_ALLMAIL;
-			useron.qwk&=~QWK_EMAIL; }
+			useron.qwk&=~QWK_EMAIL; 
+		}
 		else if(!strncmp(str+5,"ON ",3)) {
 			useron.qwk|=QWK_EMAIL;
-			useron.qwk&=~QWK_ALLMAIL; }
+			useron.qwk&=~QWK_ALLMAIL; 
+		}
 		else
-			useron.qwk&=~(QWK_ALLMAIL|QWK_EMAIL); }
+			useron.qwk&=~(QWK_ALLMAIL|QWK_EMAIL); 
+	}
 
 	else if(!strncmp(str,"FREQ ",5)) {                  /* file request */
 		padfname(str+5,f.name);
@@ -949,10 +1011,12 @@ void sbbs_t::qwkcfgline(char *buf,uint s
 				if(findfile(&cfg,usrdir[x][y],f.name))
 					break;
 			if(y<usrdirs[x])
-				break; }
+				break; 
+		}
 		if(x>=usrlibs) {
 			bprintf("\r\n%s",f.name);
-			bputs(text[FileNotFound]); }
+			bputs(text[FileNotFound]); 
+		}
 		else {
 			f.dir=usrdir[x][y];
 			getfileixb(&cfg,&f);
@@ -961,7 +1025,10 @@ void sbbs_t::qwkcfgline(char *buf,uint s
 			if(f.size==-1L)
 				bprintf(text[FileIsNotOnline],f.name);
 			else
-				addtobatdl(&f); } }
+				addtobatdl(&f); 
+		}
+		
+	}
 
 	else {
 		attr(cfg.color[clr_err]);
@@ -978,13 +1045,12 @@ int sbbs_t::set_qwk_flag(ulong flag)
 	int i;
 	char str[32];
 
+	if(useron.qwk&flag)
+		return 0;
 	if((i=getuserrec(&cfg,useron.number,U_QWK,8,str))!=0)
 		return(i);
 	useron.qwk=ahtoul(str);
 	useron.qwk|=flag;
-	if((i=putuserrec(&cfg,useron.number,U_QWK,8,ultoa(useron.qwk,str,16)))!=0)
-		return(i);
-
-	return(0);
+	return putuserrec(&cfg,useron.number,U_QWK,8,ultoa(useron.qwk,str,16));
 }