From fb1767f5a6ff69e4f0ad74419d8d96ca72faa6e9 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sun, 29 Feb 2004 15:06:47 +0000
Subject: [PATCH] Fixes for magic announce

---
 ChangeLog                 |   5 +++--
 examples/templates-de.tar | Bin 81920 -> 81920 bytes
 examples/templates-en.tar | Bin 81920 -> 81920 bytes
 examples/templates-es.tar | Bin 81920 -> 81920 bytes
 examples/templates-nl.tar | Bin 81920 -> 81920 bytes
 mbfido/announce.c         |  14 +++++++++++++-
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e5f28274..d54a8caf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,8 +9,9 @@ v0.51.1		21-Feb-2004
 		global editor (to Latin-1 for example). Local and netmail
 		areas must be done by hand because they are most likely not
 		in a group.
-		The macro templates are updated, you may want to install the
-		new ones.
+		The macro templates are updated, you MUST install the newfiles
+		macro template at least because the format changed!
+		Type "make help" in the examples subdirectory to see how.
 
 	SETUP.sh:
 		Changed to support Darwin (OS X). Note that in earlier days
diff --git a/examples/templates-de.tar b/examples/templates-de.tar
index c3945653549863050b26ff27a5f7f1c650b96c88..13cef686b20741bb33f97f8316da282ecce74fec 100644
GIT binary patch
delta 108
zcmZo@U~K@REsQO4k|qWQ42A{<Mg~BJv9Te8fuW&+sS$&M!DK_ml<kc2jJ{kVzKQ9X
z$qG4{d8rDSX$l2Jsl};zlOKADO>W>|6@*9@r52W^7MEBlIFwEf440X#7g@Lck0#>{
FQ2;b@AgurZ

delta 99
zcmZo@U~K@REsQO4lEy|R42A{<Mh3>_2F6AP3<idV24=<#3I>x68B?}1$}{?MP1cL#
znaq?eCZ(XD;85*QTI-vbo|&vrlv-GtT3lkK;84mn`JtBg<km>_?HXE)H$*2Y=l}rl
CRvV-M

diff --git a/examples/templates-en.tar b/examples/templates-en.tar
index 6de92c414b37baac79e9aa63f26ff22ea98100de..65e514edc5579649b320864900a37466c70b72f6 100644
GIT binary patch
delta 101
zcmZo@U~K@REsU)S66WR%h6V;k2FB**=BCCB28KXj!k}O<*^n`1JEJ0_E0?HmVtQt>
yLQZC0szPR(LP1e#acW-4^gwM!DM5%-QEFjnYH^8`f<x(K!RT4rzi2Z)5C#BQdmZrr

delta 91
zcmZo@U~K@REsU)S5=O=hh6V;k2FB(F24*G<28M<PX66hE29pgLQ?@fIGP-h2){W+w
tT*x6Q=1}cWTI-vbo|&vrlv-GtT3lkK;7~eUL5tC6`%i5~c9Dq+Isi3k7{mYo

diff --git a/examples/templates-es.tar b/examples/templates-es.tar
index 53ed6e5f71a3eba8e6af3fce3da45d88f931534a..406df5fca07f75288df0f875816a2653ccbb5bb2 100644
GIT binary patch
delta 107
zcmZo@U~K@REsQM+k|xH+42A{<Mg}GZ2FB(F3<idV24=<#3I>x68B?}1Dl!IhiTNg`
zXC^D;WagzRWTq(;6r~oY=9O?wp2#672$3pEEi6qfF0oQ@D4kxY$tW|~EV^zxlMdr0
FVF3OU9+m(A

delta 92
zcmZo@U~K@REsQM+lE$Xy42A{<Mh3>_2F7OQ3<idVh6W}K3I>x68B?}1Dl!IhP2Zr+
v$TN8&hoqQ8wL@vGZ(@38vO-a6VQFe{iIsvw>14;~;_Z4mjF*HbD(C<JT2&eL

diff --git a/examples/templates-nl.tar b/examples/templates-nl.tar
index df8ea3eefdc61c5ad01fe034ffa77341248a4262..958ccf3b09f0fc7996b4afaa2dc6c780fb6411e3 100644
GIT binary patch
delta 117
zcmZo@U~K@REsQN{k|xF`42A{<Mg}GZ1|~)(3<idV24*G<3I>x68B?}1sxt<0iTWm{
zXC^D;WagzRWTq(;6r~oY=9NrloFqDV0tc%gM7Aikur#%}#7e=Tbh6=X@yQcrvrhgH
Q%{tj8wst$K5#xDY0Bcht(*OVf

delta 106
zcmZo@U~K@REsQN{lE!8R42A{<Mh3>_1}4TP3<idV2Ihtg3I>x68B?}1sxt<0P5uzg
z%I21zUy@ohnQ@ZnbOS?1HqmN_(puld^vq<1qSV6D)Z!8=1&7kff-ydm`(m}X8yYd5
J=bfma0|59=9@zi@

diff --git a/mbfido/announce.c b/mbfido/announce.c
index ad796854..17e1c74a 100644
--- a/mbfido/announce.c
+++ b/mbfido/announce.c
@@ -346,7 +346,19 @@ long Report(gr_list *ta, long filepos)
 		}
 		filepos3 = ftell(fi);
 	    }
-	    MacroVars("u", "s", T_File.Magic);
+
+	    /*
+	     * Magic request
+	     */
+	    if (strlen(T_File.Magic)) {
+		MacroVars("u", "s", T_File.Magic);
+		Msg_Macro(fi);
+	    } else {
+		line = calloc(MAXSTR, sizeof(char));
+		while ((fgets(line, MAXSTR-2, fi) != NULL) && ((line[0]!='@') || (line[1]!='|'))) {}
+		free(line);
+	    }
+	    filepos3 = ftell(fi);
 	    Total++;
 	    Size += T_File.SizeKb;
 	}