Module Name: src
Committed By: rillig
Date: Sun Nov 8 01:52:24 UTC 2020
Modified Files:
src/usr.bin/make: main.c
Log Message:
make(1): parse the internal option -J strictly
To generate a diff of this commit:
cvs rdiff -u -r1.439 -r1.440 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.439 src/usr.bin/make/main.c:1.440
--- src/usr.bin/make/main.c:1.439 Sun Nov 8 01:43:58 2020
+++ src/usr.bin/make/main.c Sun Nov 8 01:52:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.439 2020/11/08 01:43:58 rillig Exp $ */
+/* $NetBSD: main.c,v 1.440 2020/11/08 01:52:24 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.439 2020/11/08 01:43:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.440 2020/11/08 01:52:24 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -215,7 +215,7 @@ parse_debug_option_F(const char *modules
snprintf(fname + len - 2, 20, "%d", getpid());
opts.debug_file = fopen(fname, mode);
- if (!opts.debug_file) {
+ if (opts.debug_file == NULL) {
fprintf(stderr, "Cannot open debug file %s\n",
fname);
usage();
@@ -375,7 +375,8 @@ MainParseArgChdir(const char *argvalue)
static void
MainParseArgJobsInternal(const char *argvalue)
{
- if (sscanf(argvalue, "%d,%d", &jp_0, &jp_1) != 2) {
+ char end;
+ if (sscanf(argvalue, "%d,%d%c", &jp_0, &jp_1, &end) != 2) {
(void)fprintf(stderr,
"%s: internal error -- J option malformed (%s)\n",
progname, argvalue);
