d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config(8): replace opteq with a call to strcasecmp

Browse Source 
This obscures the comparison slightly less; when option name appear in
files, they are case-insensitive.

MFC after:	1 week
This commit is contained in:
kevans 2019-04-15 21:20:06 +00:00
parent a8a17068f6
commit 92c71535ca
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.sbin/config/mkmakefile.c
View File

@ -62,7 +62,6 @@ static void do_rules(FILE *);
static void do_xxfiles(char *, FILE *);
static void do_objs(FILE *);
static void do_before_depend(FILE *);
static int opteq(const char *, const char *);
static void read_files(void);
static void sanitize_envline(char *result, const char *src);
static bool preprocess(char *line, char *result);
@ -565,7 +564,8 @@ read_file(char *fname)
goto nextparam;
}
SLIST_FOREACH(op, &opt, op_next)
if (op->op_value == 0 && opteq(op->op_name, wd)) {
if (op->op_value == 0 &&
strcasecmp(op->op_name, wd) == 0) {
if (not)
match = 0;
goto nextparam;
@ -628,23 +628,6 @@ read_files(void)
}
}
static int
opteq(const char *cp, const char *dp)
{
char c, d;
for (; ; cp++, dp++) {
if (*cp != *dp) {
c = isupper(*cp) ? tolower(*cp) : *cp;
d = isupper(*dp) ? tolower(*dp) : *dp;
if (c != d)
return (0);
}
if (*cp == 0)
return (1);
}
}
static void
do_before_depend(FILE *fp)
{