Sat Oct 31 08:40:54 2020 UTC ()

make(1): merge duplicate code in ModifyWord_Subst


(rillig)

diff -r1.610 -r1.611 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2020/10/30 22:55:34	1.610
+++ src/usr.bin/make/var.c 2020/10/31 08:40:54	1.611

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.610 2020/10/30 22:55:34 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.611 2020/10/31 08:40:54 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -119,27 +119,27 @@
 #include    <sys/types.h>
 #include    <regex.h>
 #endif
 #include    <inttypes.h>
 #include    <limits.h>
 #include    <time.h>
 #include    "make.h"
 #include    "dir.h"
 #include    "job.h"
 #include    "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.610 2020/10/30 22:55:34 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.611 2020/10/31 08:40:54 rillig Exp $");
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
 #define VAR_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(VAR, fmt, arg1, arg2, arg3)
 #define VAR_DEBUG4(fmt, arg1, arg2, arg3, arg4) DEBUG4(VAR, fmt, arg1, arg2, arg3, arg4)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
 @@ -1284,39 +1284,33 @@ ModifyWord_Subst(const char *word, SepBu
+{
     size_t wordLen = strlen(word);
     struct ModifyWord_SubstArgs *args = data;
     const char *match;
     if ((args->pflags & VARP_SUB_ONE) && args->matched)
 	goto nosub;
     if (args->pflags & VARP_ANCHOR_START) {
 	if (wordLen < args->lhsLen ||
 	    memcmp(word, args->lhs, args->lhsLen) != 0)
 	    goto nosub;
-	if (args->pflags & VARP_ANCHOR_END) {
+	if ((args->pflags & VARP_ANCHOR_END) && wordLen != args->lhsLen)
-	    if (wordLen != args->lhsLen)
+	    goto nosub;
 		goto nosub;
 	/* :S,^prefix,replacement, or :S,^whole$,replacement, */
-	    /* :S,^whole$,replacement, */
+	SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
-	    SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
+	SepBuf_AddBytes(buf, word + args->lhsLen, wordLen - args->lhsLen);
-	    args->matched = TRUE;
+	args->matched = TRUE;
 	} else {
 	    /* :S,^prefix,replacement, */
 	    SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
 	    SepBuf_AddBytes(buf, word + args->lhsLen, wordLen - args->lhsLen);
 	    args->matched = TRUE;
 	return;
+    }
     if (args->pflags & VARP_ANCHOR_END) {
 	const char *start;
 	if (wordLen < args->lhsLen)
 	    goto nosub;
 	start = word + (wordLen - args->lhsLen);
 	if (memcmp(start, args->lhs, args->lhsLen) != 0)
 	    goto nosub;