From fc8872bb2ebd63fca12fc695ea9626e05ebccc95 Mon Sep 17 00:00:00 2001
From: "Kurt A. Schoens" <kas@ucbvax.Berkeley.EDU>
Date: Mon, 26 Jan 1981 18:30:38 -0800
Subject: [PATCH] changed reply code to change replied subject to Re: &

SCCS-vsn: usr.bin/mail/cmd3.c 1.8
---
 usr/src/usr.bin/mail/cmd3.c | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/usr/src/usr.bin/mail/cmd3.c b/usr/src/usr.bin/mail/cmd3.c
index 281f3c3ec3..44e4b84a07 100644
--- a/usr/src/usr.bin/mail/cmd3.c
+++ b/usr/src/usr.bin/mail/cmd3.c
@@ -9,7 +9,7 @@
  * Still more user commands.
  */
 
-static char *SccsId = "@(#)cmd3.c	1.7 %G%";
+static char *SccsId = "@(#)cmd3.c	1.8 %G%";
 
 /*
  * Process a shell escape by saving signals, ignoring signals,
@@ -199,7 +199,7 @@ respond(msgvec)
 	}
 	mp = &message[msgvec[0] - 1];
 	dot = mp;
-	rcv = nameof(mp);
+	rcv = nameof(mp, 1);
 	strcpy(buf, "");
 	cp = hfield("to", mp);
 	if (cp != NOSTR)
@@ -221,6 +221,7 @@ respond(msgvec)
 	head.h_subject = hfield("subject", mp);
 	if (head.h_subject == NOSTR)
 		head.h_subject = hfield("subj", mp);
+	head.h_subject = reedit(head.h_subject);
 	head.h_cc = NOSTR;
 	cp = hfield("cc", mp);
 	if (cp != NOSTR) {
@@ -234,6 +235,29 @@ respond(msgvec)
 	return(0);
 }
 
+/*
+ * Modify the subject we are replying to to begin with Re: if
+ * it does not already.
+ */
+
+char *
+reedit(subj)
+	char *subj;
+{
+	char sbuf[10];
+	register char *newsubj;
+
+	if (subj == NOSTR)
+		return(NOSTR);
+	strncpy(sbuf, subj, 3);
+	sbuf[3] = 0;
+	if (icequal(sbuf, "re:"))
+		return(subj);
+	newsubj = salloc(strlen(subj) + 6);
+	sprintf(newsubj, "Re:  %s", subj);
+	return(newsubj);
+}
+
 /*
  * Preserve the named messages, so that they will be sent
  * back to the system mailbox.
@@ -603,7 +627,7 @@ Respond(msgvec)
 	for (s = 0, ap = msgvec; *ap != 0; ap++) {
 		mp = &message[*ap - 1];
 		dot = mp;
-		s += strlen(nameof(mp)) + 1;
+		s += strlen(nameof(mp, 1)) + 1;
 	}
 	if (s == 0)
 		return(0);
@@ -611,7 +635,7 @@ Respond(msgvec)
 	head.h_to = cp;
 	for (ap = msgvec; *ap != 0; ap++) {
 		mp = &message[*ap - 1];
-		cp = copy(nameof(mp), cp);
+		cp = copy(nameof(mp, 1), cp);
 		*cp++ = ' ';
 	}
 	*--cp = 0;
@@ -620,7 +644,7 @@ Respond(msgvec)
 	head.h_seq = 0;
 	if (subject == NOSTR)
 		subject = hfield("subj", mp);
-	head.h_subject = subject;
+	head.h_subject = reedit(subject);
 	if (subject != NOSTR)
 		head.h_seq++;
 	head.h_cc = NOSTR;
-- 
2.20.1