From 4a36e98f5cd22642a3dc0b1c4793474226622e44 Mon Sep 17 00:00:00 2001
From: keie <none@none>
Date: Mon, 26 Nov 1984 17:14:17 +0000
Subject: [PATCH] Treatment of -R flag is altered. 1 - if recognized by mapflag
 and not by Ack internally no     complaint is given. 2 - If recognized by
 both mapflag and internally:        -R....-.... : effectuate only mapflag
 command        otherwise   : effectuate both. 3 - If not recognized at all,
 give a warning message and     pass the flag to the linker.

---
 util/ack/main.c  |  8 ++++++--
 util/ack/trans.c | 28 +++++++++++++++++-----------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/util/ack/main.c b/util/ack/main.c
index 4aae78456..c1e7a4a57 100644
--- a/util/ack/main.c
+++ b/util/ack/main.c
@@ -198,7 +198,7 @@ vieuwargs(argc,argv) char **argv ; {
 			break ;
 	   case 't':    t_flag++ ;
 			break ;
-	   case 'R':    do_Rflag(argp); eaten=1;
+	   case 'R':    eaten=1;
 			break ;
 	   case 'r':    if ( argp[2]!=SUFCHAR ) {
 				error("-r must be followed by %c",SUFCHAR) ;
@@ -234,7 +234,11 @@ vieuwargs(argc,argv) char **argv ; {
 		if ( !hide ) {
 			register char *tokeep ;
 			tokeep=keeps(argp) ;
-			*tokeep |= NO_SCAN ;
+			if ( argp[1]=='R' ) {
+				do_Rflag(tokeep); 
+			} else {
+				*tokeep |= NO_SCAN ;
+			}
 			l_add(&flags,tokeep) ;
 		}
 		if ( argp[2] && !eaten ) {
diff --git a/util/ack/trans.c b/util/ack/trans.c
index 89f386747..1e383fe29 100644
--- a/util/ack/trans.c
+++ b/util/ack/trans.c
@@ -163,21 +163,20 @@ transini() {
 	register list_elem *elem ;
 	register trf *phase ;
 
-	scanlist(l_first(R_list), elem) {
-		set_Rflag(l_content(*elem)) ;
-	}
-	l_clear(&R_list) ;
 	scanlist(l_first(tr_list), elem) {
 		phase = t_cont(*elem) ;
 		if ( !phase->t_linker ) getmapflags(phase);
 	}
+	scanlist(l_first(R_list), elem) {
+		set_Rflag(l_content(*elem)) ;
+	}
+	l_clear(&R_list) ;
 	setpvar(keeps(NEEDS),needvar) ;
 	setpvar(keeps(HEAD),headvar) ;
 	setpvar(keeps(TAIL),tailvar) ;
 }
 
 set_Rflag(argp) register char *argp ; {
-	int     seen ;
 	register char *eos ;
 	register list_elem *prog ;
 	register int length ;
@@ -192,23 +191,30 @@ set_Rflag(argp) register char *argp ; {
 		if ( eq && eq<eos ) eos= eq ;
 	}
 	if ( colon && ( !eos || eos>colon ) ) eos= colon ;
-	if ( !eos ) fuerror("Incorrect use of -R flag") ;
+	if ( !eos ) {
+		if ( !(argp[0]&NO_SCAN) ) werror("Incorrect use of -R flag") ;
+		return ;
+	}
 	length= eos - &argp[2] ;
-	seen=NO ;
 	scanlist(l_first(tr_list), prog) {
-		if ( strncmp(t_cont(*prog)->t_name, &argp[2], length )==0 ) {
+		if ( strncmp(t_cont(*prog)->t_name, &argp[2], length )==0 &&
+		     t_cont(*prog)->t_name[length]==0  /* Same name length */) {
 			if ( *eos=='-' ) {
-				l_add(&(t_cont(*prog)->t_flags),eos) ;
+				if ( !(argp[0]&NO_SCAN) ) {
+					/* If not already taken by a mapflag */
+					l_add(&(t_cont(*prog)->t_flags),eos) ;
+				}
 			} else
 			if ( *eos=='=' ) {
 				t_cont(*prog)->t_prog= eos+1 ;
 			} else {
 				t_cont(*prog)->t_priority= atoi(eos+1) ;
 			}
-			seen=YES ; 
+			argp[0] |= NO_SCAN ;
+			return ;
 		}
 	}
-	if ( !seen ) error("Cannot find program for %s",argp) ;
+	if ( !(argp[0]&NO_SCAN) ) werror("Cannot find program for %s",argp) ;
 	return ;
 }
 
-- 
2.34.1