Module Name: src
Committed By: rillig
Date: Sat Nov 14 18:14:34 UTC 2020
Modified Files:
src/usr.bin/make: main.c
Log Message:
make(1): clean up InitDefSysIncPath
Flipping the arguments to strncmp puts the subject first in the
sentence. Inverting the condition makes the code flow easier to follow.
To generate a diff of this commit:
cvs rdiff -u -r1.463 -r1.464 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.463 src/usr.bin/make/main.c:1.464
--- src/usr.bin/make/main.c:1.463 Sat Nov 14 18:07:26 2020
+++ src/usr.bin/make/main.c Sat Nov 14 18:14:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.463 2020/11/14 18:07:26 rillig Exp $ */
+/* $NetBSD: main.c,v 1.464 2020/11/14 18:14:34 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.463 2020/11/14 18:07:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.464 2020/11/14 18:14:34 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1189,14 +1189,14 @@ InitDefSysIncPath(char *syspath)
*cp++ = '\0';
/* look for magic parent directory search string */
- if (strncmp(".../", start, 4) != 0) {
- (void)Dir_AddDir(defSysIncPath, start);
- } else {
+ if (strncmp(start, ".../", 4) == 0) {
char *dir = Dir_FindHereOrAbove(curdir, start + 4);
if (dir != NULL) {
(void)Dir_AddDir(defSysIncPath, dir);
free(dir);
}
+ } else {
+ (void)Dir_AddDir(defSysIncPath, start);
}
}
