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): don't modify progname in usage
details: https://anonhg.NetBSD.org/src/rev/cc6fc7423392
branches: trunk
changeset: 946053:cc6fc7423392
user: rillig <rillig%NetBSD.org@localhost>
date: Sat Nov 14 21:55:22 2020 +0000
description:
make(1): don't modify progname in usage
diffstat:
usr.bin/make/main.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diffs (38 lines):
diff -r 3e1de9f32665 -r cc6fc7423392 usr.bin/make/main.c
--- a/usr.bin/make/main.c Sat Nov 14 21:29:44 2020 +0000
+++ b/usr.bin/make/main.c Sat Nov 14 21:55:22 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.465 2020/11/14 18:36:27 rillig Exp $ */
+/* $NetBSD: main.c,v 1.466 2020/11/14 21:55:22 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.465 2020/11/14 18:36:27 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.466 2020/11/14 21:55:22 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -187,16 +187,14 @@
MAKE_ATTR_DEAD static void
usage(void)
{
- char *p;
- if ((p = strchr(progname, '[')) != NULL)
- *p = '\0';
+ size_t prognameLen = strcspn(progname, "[");
(void)fprintf(stderr,
-"usage: %s [-BeikNnqrstWwX] \n"
+"usage: %.*s [-BeikNnqrstWwX] \n"
" [-C directory] [-D variable] [-d flags] [-f makefile]\n"
" [-I directory] [-J private] [-j max_jobs] [-m directory] [-T file]\n"
" [-V variable] [-v variable] [variable=value] [target ...]\n",
- progname);
+ (int)prognameLen, progname);
exit(2);
}
Home |
Main Index |
Thread Index |
Old Index