Module Name: src
Committed By: rillig
Date: Sat Jan 8 11:04:13 UTC 2022
Modified Files:
src/usr.bin/make: metachar.h var.c
Log Message:
make: rename is_shell_metachar, fix character conversion warning
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/metachar.h
cvs rdiff -u -r1.996 -r1.997 src/usr.bin/make/var.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/metachar.h
diff -u src/usr.bin/make/metachar.h:1.19 src/usr.bin/make/metachar.h:1.20
--- src/usr.bin/make/metachar.h:1.19 Wed Dec 15 12:08:25 2021
+++ src/usr.bin/make/metachar.h Sat Jan 8 11:04:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: metachar.h,v 1.19 2021/12/15 12:08:25 rillig Exp $ */
+/* $NetBSD: metachar.h,v 1.20 2022/01/08 11:04:13 rillig Exp $ */
/*
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
extern const unsigned char _metachar[];
MAKE_INLINE bool MAKE_ATTR_USE
-is_shell_metachar(char c)
+ch_is_shell_meta(char c)
{
return _metachar[c & 0x7f] != 0;
}
@@ -44,7 +44,7 @@ is_shell_metachar(char c)
MAKE_INLINE bool MAKE_ATTR_USE
needshell(const char *cmd)
{
- while (!is_shell_metachar(*cmd) && *cmd != ':' && *cmd != '=')
+ while (!ch_is_shell_meta(*cmd) && *cmd != ':' && *cmd != '=')
cmd++;
return *cmd != '\0';
}
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.996 src/usr.bin/make/var.c:1.997
--- src/usr.bin/make/var.c:1.996 Fri Jan 7 20:37:25 2022
+++ src/usr.bin/make/var.c Sat Jan 8 11:04:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.996 2022/01/07 20:37:25 rillig Exp $ */
+/* $NetBSD: var.c,v 1.997 2022/01/08 11:04:13 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.996 2022/01/07 20:37:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.997 2022/01/08 11:04:13 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -1870,7 +1870,7 @@ VarQuote(const char *str, bool quoteDoll
LazyBuf_AddStr(buf, newline);
continue;
}
- if (ch_isspace(*p) || is_shell_metachar((unsigned char)*p))
+ if (ch_isspace(*p) || ch_is_shell_meta(*p))
LazyBuf_Add(buf, '\\');
LazyBuf_Add(buf, *p);
if (quoteDollar && *p == '$')
