From 2343ed5a8b726544ea1df56969743c4626cee153 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Mon, 30 Aug 2004 13:43:37 +0000
Subject: [PATCH] Automatic tearline and originline adding

---
 ChangeLog     |  4 +++-
 mbfido/post.c | 40 ++++++++++++++++++++++++++++------------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 95192034..2779c58e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,7 +46,9 @@ v0.61.4		11-Aug-2004
 	mbmsg:
 		Fixed counter in log that should show the number of linked 
 		messages.
-		With the post command no tearline is added anymore.
+		With the post command a check is done to see if the input file
+		has a tearline and origin line, if not mbmsg will add these
+		lines, else the lines of the input file are used.
 
 	mbsebbs:
 		The exec_nosuid function for doors now also has a extra small
diff --git a/mbfido/post.c b/mbfido/post.c
index 0d5e6751..6914dcec 100644
--- a/mbfido/post.c
+++ b/mbfido/post.c
@@ -43,7 +43,7 @@ extern int		do_quiet;		/* Suppress screen output    */
 
 int Post(char *To, long Area, char *Subj, char *File, char *Flavor)
 {
-    int		    i, rc = FALSE;
+    int		    i, rc = FALSE, has_tear = FALSE, has_origin = FALSE;
     char	    *aka, *temp, *sAreas;
     FILE	    *fp, *tp;
     unsigned long   crc = -1;
@@ -226,6 +226,15 @@ int Post(char *To, long Area, char *Subj, char *File, char *Flavor)
     sprintf(temp, "\001TZUTC: %s", gmtoffset(tt));
     MsgText_Add2(temp);
 
+    while ((Fgets(temp, PATH_MAX -1, tp)) != NULL) {
+	if (strncmp(temp, "--- ", 4) == 0)
+	    has_tear = TRUE;
+	if (strncmp(temp, " * Origin: ", 11) == 0)
+	    has_origin = TRUE;
+    }
+    rewind(tp);
+    Syslog('m', "has tearline=%s, has origin=%s", has_tear?"True":"False", has_origin?"True":"False");
+
     /*
      * Add the file as text
      */
@@ -235,20 +244,27 @@ int Post(char *To, long Area, char *Subj, char *File, char *Flavor)
     /*
      * Finish the message
      */
-    aka = calloc(40, sizeof(char));
+    if (! has_tear) {
+	MsgText_Add2((char *)"");
+	MsgText_Add2(TearLine());
+    }
 
-    if (msgs.Aka.point)
-	sprintf(aka, "(%d:%d/%d.%d)", msgs.Aka.zone, msgs.Aka.net, msgs.Aka.node, msgs.Aka.point);
-    else
-	sprintf(aka, "(%d:%d/%d)", msgs.Aka.zone, msgs.Aka.net, msgs.Aka.node);
+    if (! has_origin) {
+	aka = calloc(40, sizeof(char));
 
-    if (strlen(msgs.Origin))
-	sprintf(temp, " * Origin: %s %s", msgs.Origin, aka);
-    else
-	sprintf(temp, " * Origin: %s %s", CFG.origin, aka);
+	if (msgs.Aka.point)
+	    sprintf(aka, "(%d:%d/%d.%d)", msgs.Aka.zone, msgs.Aka.net, msgs.Aka.node, msgs.Aka.point);
+	else
+	    sprintf(aka, "(%d:%d/%d)", msgs.Aka.zone, msgs.Aka.net, msgs.Aka.node);
 
-    MsgText_Add2(temp);
-    free(aka);
+	if (strlen(msgs.Origin))
+	    sprintf(temp, " * Origin: %s %s", msgs.Origin, aka);
+	else
+	    sprintf(temp, " * Origin: %s %s", CFG.origin, aka);
+
+	MsgText_Add2(temp);
+	free(aka);
+    }
 
     Msg_AddMsg();
     Msg_UnLock();