Sat Nov 21 18:06:09 2020 UTC ()

make(1): document necessary condition in SuffUpdateTarget


(rillig)

diff -r1.262 -r1.263 src/usr.bin/make/suff.c

--- src/usr.bin/make/suff.c 2020/11/21 17:18:36	1.262
+++ src/usr.bin/make/suff.c 2020/11/21 18:06:09	1.263

 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.262 2020/11/21 17:18:36 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.263 2020/11/21 18:06:09 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.
 @@ -104,27 +104,27 @@
  *	Suff_FindDeps	Find implicit sources for and the location of
  *			a target based on its suffix. Returns the
  *			bottom-most node added to the graph or NULL
  *			if the target had no implicit sources.
+ *
  *	Suff_FindPath	Return the appropriate path to search in order to
  *			find the node.
  */
 #include "make.h"
 #include "dir.h"
 /*	"@(#)suff.c	8.4 (Berkeley) 3/21/94"	*/
-MAKE_RCSID("$NetBSD: suff.c,v 1.262 2020/11/21 17:18:36 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.263 2020/11/21 18:06:09 rillig Exp $");
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
 #define SUFF_DEBUG2(fmt, arg1, arg2) DEBUG2(SUFF, fmt, arg1, arg2)
 typedef List SuffList;
 typedef ListNode SuffListNode;
 typedef List SrcList;
 typedef ListNode SrcListNode;
 static SuffList *sufflist;	/* List of suffixes */
 #ifdef CLEANUP
 @@ -657,37 +657,43 @@ SuffUpdateTarget(GNode *target, GNode **
     Suff *srcSuff, *targSuff;
     char *ptr;
     if (*inout_main == NULL && *r && !(target->type & OP_NOTARGET)) {
 	*inout_main = target;
 	Targ_SetMain(target);
 	return TRUE;
+    }
     if (target->type == OP_TRANSFORM)
 	return FALSE;
     /*
      * XXX: What is the purpose of the 'ptr == target->name' condition here?
      * In suff-rebuild.mk in the line '.SUFFIXES: .c .b .a', it prevents the
      * rule '.b.c' from being added again during Suff_AddSuffix(".b").
      */
     /*
      * XXX: What about a transformation ".cpp.c"?  If ".c" is added as a new
      * suffix, it seems wrong that this transformation would be skipped just
      * because ".c" happens to be a prefix of ".cpp".
      */
-    if ((ptr = strstr(target->name, suff->name)) == NULL ||
+    ptr = strstr(target->name, suff->name);
-	ptr == target->name)
+    if (ptr == NULL)
 	return FALSE;
     /*
      * XXX: In suff-rebuild.mk, in the line '.SUFFIXES: .c .b .a', this
      * condition prevents the rule '.b.c' from being added again during
      * Suff_AddSuffix(".b").
+     *
      * XXX: Removing this paragraph makes suff-add-later.mk use massive
      * amounts of memory.
      */
     if (ptr == target->name)
 	return FALSE;
     if (SuffParseTransform(target->name, &srcSuff, &targSuff)) {
 	if (*inout_main == target) {
 	    *r = TRUE;
 	    *inout_main = NULL;
 	    Targ_SetMain(NULL);
+	}
 	Lst_Free(target->children);
 	target->children = Lst_New();
 	target->type = OP_TRANSFORM;
 	/*
 	 * link the two together in the proper relationship and order