Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make(1): remove unnecessary argument validation



details:   https://anonhg.NetBSD.org/src/rev/04c3db84460a
branches:  trunk
changeset: 1012334:04c3db84460a
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Jul 27 19:59:59 2020 +0000

description:
make(1): remove unnecessary argument validation

diffstat:

 usr.bin/make/var.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r 6fa5bc2c57a1 -r 04c3db84460a usr.bin/make/var.c
--- a/usr.bin/make/var.c        Mon Jul 27 19:53:37 2020 +0000
+++ b/usr.bin/make/var.c        Mon Jul 27 19:59:59 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.337 2020/07/27 17:41:09 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.338 2020/07/27 19:59:59 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.337 2020/07/27 17:41:09 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.338 2020/07/27 19:59:59 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c      8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.337 2020/07/27 17:41:09 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.338 2020/07/27 19:59:59 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -690,6 +690,8 @@
 
 /*
  * This is called when .unexport[-env] is seen.
+ *
+ * str must have the form "unexport[-env] varname...".
  */
 void
 Var_UnExport(char *str)
@@ -700,12 +702,9 @@
     Boolean unexport_env;
     int n;
 
-    if (str == NULL || str[0] == '\0')
-       return;                 /* assert? */
-
     vlist = NULL;
 
-    str += 8;
+    str += strlen("unexport");
     unexport_env = (strncmp(str, "-env", 4) == 0);
     if (unexport_env) {
        char **newenv;



Home | Main Index | Thread Index | Old Index