summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/libc/port/locale/fnmatch.c24
-rw-r--r--usr/src/lib/libdisasm/Makefile.targ9
-rw-r--r--usr/src/lib/libsaveargs/Makefile.targ9
-rw-r--r--usr/src/lib/libumem/Makefile.targ9
4 files changed, 25 insertions, 26 deletions
diff --git a/usr/src/lib/libc/port/locale/fnmatch.c b/usr/src/lib/libc/port/locale/fnmatch.c
index cf7b1c2372..2605246ae0 100644
--- a/usr/src/lib/libc/port/locale/fnmatch.c
+++ b/usr/src/lib/libc/port/locale/fnmatch.c
@@ -13,7 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -107,10 +107,8 @@ fnmatch1(const char *pattern, const char *string, const char *stringstart,
}
switch (pc) {
case EOS:
- /*
- * Removed FNM_LEADING_DIR, as it is not present
- * on Solaris.
- */
+ if ((flags & FNM_LEADING_DIR) && sc == '/')
+ return (0);
if (sc == EOS)
return (0);
goto backtrack;
@@ -139,7 +137,8 @@ fnmatch1(const char *pattern, const char *string, const char *stringstart,
/* Optimize for pattern with * at end or before /. */
if (c == EOS)
if (flags & FNM_PATHNAME)
- return (strchr(string, '/') == NULL ?
+ return ((flags & FNM_LEADING_DIR) ||
+ strchr(string, '/') == NULL ?
0 : FNM_NOMATCH);
else
return (0);
@@ -184,10 +183,9 @@ fnmatch1(const char *pattern, const char *string, const char *stringstart,
if (!(flags & FNM_NOESCAPE)) {
pclen = mbrtowc_l(&pc, pattern, MB_LEN_MAX,
&patmbs, loc);
- if (pclen == (size_t)-1 || pclen == (size_t)-2)
+ if (pclen == 0 || pclen == (size_t)-1 ||
+ pclen == (size_t)-2)
return (FNM_NOMATCH);
- if (pclen == 0)
- pc = '\\';
pattern += pclen;
}
/* FALLTHROUGH */
@@ -196,7 +194,7 @@ fnmatch1(const char *pattern, const char *string, const char *stringstart,
string += sclen;
if (pc == sc)
break;
- else if ((flags & FNM_IGNORECASE) &&
+ else if ((flags & FNM_CASEFOLD) &&
(towlower_l(pc, loc) == towlower_l(sc, loc)))
break;
else {
@@ -251,7 +249,7 @@ rangematch(const char *pattern, wchar_t test, int flags, char **newp,
if ((negate = (*pattern == '!' || *pattern == '^')) != 0)
++pattern;
- if (flags & FNM_IGNORECASE)
+ if (flags & FNM_CASEFOLD)
test = towlower_l(test, loc);
/*
@@ -276,7 +274,7 @@ rangematch(const char *pattern, wchar_t test, int flags, char **newp,
return (RANGE_NOMATCH);
pattern += pclen;
- if (flags & FNM_IGNORECASE)
+ if (flags & FNM_CASEFOLD)
c = towlower_l(c, loc);
if (*pattern == '-' && *(pattern + 1) != EOS &&
@@ -292,7 +290,7 @@ rangematch(const char *pattern, wchar_t test, int flags, char **newp,
if (c2 == EOS)
return (RANGE_ERROR);
- if (flags & FNM_IGNORECASE)
+ if (flags & FNM_CASEFOLD)
c2 = towlower_l(c2, loc);
if (loc->collate->lc_is_posix ?
diff --git a/usr/src/lib/libdisasm/Makefile.targ b/usr/src/lib/libdisasm/Makefile.targ
index e9f2c11268..cdd938135f 100644
--- a/usr/src/lib/libdisasm/Makefile.targ
+++ b/usr/src/lib/libdisasm/Makefile.targ
@@ -21,6 +21,7 @@
#
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
+# Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
#
#
@@ -35,10 +36,10 @@ install: $(TYPES:%=install.%)
all: $(TYPES:%=all.%)
$(TYPES:%=all.%):
- @CURTYPE=$(@:all.%=%) $(MAKE) $@.targ
+ @$(MAKE) $@.targ CURTYPE=$(@:all.%=%)
$(TYPES:%=install.%):
- @CURTYPE=$(@:install.%=%) $(MAKE) $@.targ
+ @$(MAKE) $@.targ CURTYPE=$(@:install.%=%)
install.library.targ: all.library $(INSTALL_DEPS_library)
install.standalone.targ: all.standalone $(INSTALL_DEPS_standalone)
@@ -49,7 +50,7 @@ all.standalone.targ: $(STANDLIBRARY)
lint: $(TYPES:%=lint.%)
$(TYPES:%=lint.%):
- @CURTYPE=$(@:lint.%=%) $(MAKE) lintcheck
+ @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%)
$(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ)
$(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ)
@@ -59,7 +60,7 @@ $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ)
clobber: $(TYPES:%=clobber.%)
$(TYPES:%=clobber.%):
- @CURTYPE=$(@:clobber.%=%) $(MAKE) clobber.targ
+ @$(MAKE) clobber.targ CURTYPE=$(@:clobber.%=%)
clobber.targ: clean
-$(RM) $(CLOBBERTARGFILES)
diff --git a/usr/src/lib/libsaveargs/Makefile.targ b/usr/src/lib/libsaveargs/Makefile.targ
index fac60a013e..f90deed1db 100644
--- a/usr/src/lib/libsaveargs/Makefile.targ
+++ b/usr/src/lib/libsaveargs/Makefile.targ
@@ -21,6 +21,7 @@
#
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
+# Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
#
#
@@ -35,10 +36,10 @@ install: $(TYPES:%=install.%)
all: $(TYPES:%=all.%)
$(TYPES:%=all.%):
- @CURTYPE=$(@:all.%=%) $(MAKE) $@.targ
+ @$(MAKE) $@.targ CURTYPE=$(@:all.%=%)
$(TYPES:%=install.%):
- @CURTYPE=$(@:install.%=%) $(MAKE) $@.targ
+ @$(MAKE) $@.targ CURTYPE=$(@:install.%=%)
install.library.targ: all.library $(INSTALL_DEPS_library)
install.standalone.targ: all.standalone $(INSTALL_DEPS_standalone)
@@ -49,7 +50,7 @@ all.standalone.targ: $(STANDLIBRARY)
lint: $(TYPES:%=lint.%)
$(TYPES:%=lint.%):
- @CURTYPE=$(@:lint.%=%) $(MAKE) lintcheck
+ @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%)
$(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ)
$(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ)
@@ -59,7 +60,7 @@ $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ)
clobber: $(TYPES:%=clobber.%)
$(TYPES:%=clobber.%):
- @CURTYPE=$(@:clobber.%=%) $(MAKE) clobber.targ
+ @$(MAKE) clobber.targ CURTYPE=$(@:clobber.%=%)
clobber.targ: clean
-$(RM) $(CLOBBERTARGFILES)
diff --git a/usr/src/lib/libumem/Makefile.targ b/usr/src/lib/libumem/Makefile.targ
index 1e5cad3062..c56b5fd9f5 100644
--- a/usr/src/lib/libumem/Makefile.targ
+++ b/usr/src/lib/libumem/Makefile.targ
@@ -21,8 +21,7 @@
#
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
#
#
@@ -40,7 +39,7 @@ install.standalone: all.standalone $(INSTALL_DEPS_standalone)
all: $(TYPES:%=all.%)
$(TYPES:%=all.%):
- @CURTYPE=$(@:all.%=%) $(MAKE) $@.targ
+ @$(MAKE) $@.targ CURTYPE=$(@:all.%=%)
all.library.targ: $(LIBS)
all.standalone.targ: $(STANDLIBRARY)
@@ -48,7 +47,7 @@ all.standalone.targ: $(STANDLIBRARY)
lint: $(TYPES:%=lint.%)
$(TYPES:%=lint.%):
- @CURTYPE=$(@:lint.%=%) $(MAKE) lintcheck
+ @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%)
$(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ)
$(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ)
@@ -58,7 +57,7 @@ $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ)
clobber: $(TYPES:%=clobber.%)
$(TYPES:%=clobber.%):
- @CURTYPE=$(@:clobber.%=%) $(MAKE) clobber.targ
+ @$(MAKE) clobber.targ CURTYPE=$(@:clobber.%=%)
clobber.targ: clean
-$(RM) $(CLOBBERTARGFILES)
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-01 07:01:26 +0000