From 2c0813c3b9f08bb8e177b3d72c4a289ca2a714f0 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Thu, 4 Apr 2002 18:46:34 +0000
Subject: [PATCH] Fixed forward message

---
 examples/templates.tar | Bin 51200 -> 51200 bytes
 mbfido/forward.c       |  19 +++----------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/examples/templates.tar b/examples/templates.tar
index 20ee29467a2c7cf9577db639f3e2839d979694b6..8d3019e64e9a07a03356a6fb85ae61a499b44829 100644
GIT binary patch
delta 172
zcmZpez}zr_c|*$-Nn=AZ1_N^wQ)5Fza}#r81_MJwQ$uqG1%t^Sxl%SWP7PvI@b`07
z2zGT2@$~nz;!@^PRse#Kj8ui()Z*gA^i;jg`}z79CmYWwlT1;tRd93hQ%En$FD+0=
zNi9w;$}A|!%+H&=bjIn)6KC$^L&z#9IHXMWoMkSOty$}vn4XyoG8PCNvbh|pCoh}j
Nx;a0_k8#l)9RObJHs}BV

delta 160
zcmZpez}zr_c|*$-NmEmE1_N^wQzJ7|Gh<UD1_MJwQ)5F01%t^Sxl%SWP7PvY4e<za
zb)9Swq&)d*ko@Mp;F*k*8E2GDo-*S&yMiH?vVub1<k?{|lVfLYpR7E~OiiP>q$npf
zPsbr!v(`5;Ju_JW0vxir9I72)vXgUXxlRs>lAe4oN`=WGZ*pLi%;c_muE`r`ty?rl
F2LRZDHTnPm

diff --git a/mbfido/forward.c b/mbfido/forward.c
index 89ea6d27..07a144b5 100644
--- a/mbfido/forward.c
+++ b/mbfido/forward.c
@@ -48,14 +48,13 @@
 
 void ForwardFile(fidoaddr Node, fa_list *sbl)
 {
-	char		*subject = NULL, *temp, *line, *fwdfile = NULL, *ticfile = NULL, fname[PATH_MAX], *ticname;
+	char		*subject = NULL, *temp, *fwdfile = NULL, *ticfile = NULL, fname[PATH_MAX], *ticname;
 	FILE		*fp, *fi, *net;
 	char		flavor;
 	faddr		*dest, *route, *Fa;
 	int		i, z, n;
 	time_t		now;
 	fa_list		*tmp;
-	long		filepos;
 
 	Syslog('+', "Forward file to %s", aka2str(Node));
 
@@ -137,9 +136,9 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
 	if (nodes.Message) {
 	    if ((net = SendMgrMail(fido2faddr(Node), CFG.ct_KeepMgr, TRUE, (char *)"Filemgr", subject, NULL)) != NULL) {
 		if ((fi = OpenMacro("forward.tic", nodes.Language)) != NULL) {
-		    MacroVars("abcfghijmns", "ssdsddsssss", TIC.TicIn.Area, TIC.TicIn.AreaDesc, TIC.FileCost,
+		    MacroVars("abcdfghijmns", "ssdssddsssss", TIC.TicIn.Area, tic.Comment, TIC.FileCost, fgroup.Comment,
 							    TIC.TicIn.FullName, TIC.FileSize, TIC.FileSize / 1024, 
-							    TIC.TicIn.Crc, TIC.TicIn.Origin, " ", TIC.TicIn.LDesc[0], nodes.Sysop);
+							    TIC.TicIn.Crc, TIC.TicIn.Origin, " ", TIC.TicIn.Desc, nodes.Sysop);
 		    if (TIC.SendOrg)
 			MacroVars("e", "s", TIC.RealName);
 		    else
@@ -149,18 +148,6 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
 		    if (strlen(TIC.TicIn.Replace))
 			MacroVars("l", "s", TIC.TicIn.Replace);
 		    MacroRead(fi, net);
-		    filepos = ftell(fi);
-		    for (i = 1; i < 25; i++) {
-			fseek(fi, filepos, SEEK_SET);
-			if (strlen(TIC.TicIn.LDesc[i])) {
-			    MacroRead(fi, net);
-			} else {
-			    line = calloc(255, sizeof(char));
-			    while ((fgets(line, 254, fi) != NULL) && ((line[0]!='@') || (line[1]!='|'))) {}
-			    free(line);
-			}
-		    }
-		    MacroRead(fi, net);
 		    fprintf(net, "%s\r", TearLine());
 		    CloseMail(net, fido2faddr(Node));
 		}