Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge

Conflicts:
	coreutils/ls.c
	include/platform.h
	libbb/bb_basename.c

1 files changed, 39 insertions, 3 deletions

diff --git a/findutils/find.c b/findutils/find.c
index 9ae84fa0d..050d6373e 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -264,6 +264,7 @@
 //usage:     "\n        -iname PATTERN  Case insensitive -name"
 //usage:        IF_FEATURE_FIND_PATH(
 //usage:     "\n        -path PATTERN   Match path to PATTERN"
+//usage:     "\n        -ipath PATTERN  Case insensitive -path"
 //usage:        )
 //usage:        IF_FEATURE_FIND_REGEX(
 //usage:     "\n        -regex PATTERN  Match path to regex PATTERN"
@@ -329,7 +330,11 @@
 #include <fnmatch.h>
 #include "libbb.h"
 #if ENABLE_FEATURE_FIND_REGEX
-#include "xregex.h"
+# include "xregex.h"
+#endif
+/* GNUism: */
+#ifndef FNM_CASEFOLD
+# define FNM_CASEFOLD 0
 #endif
 
 /* This is a NOEXEC applet. Be very careful! */
@@ -352,7 +357,7 @@ typedef struct {
 
                         ACTS(print)
                         ACTS(name,  const char *pattern; bool iname;)
-IF_FEATURE_FIND_PATH(   ACTS(path,  const char *pattern;))
+IF_FEATURE_FIND_PATH(   ACTS(path,  const char *pattern; bool ipath;))
 IF_FEATURE_FIND_REGEX(  ACTS(regex, regex_t compiled_pattern;))
 IF_FEATURE_FIND_PRINT0( ACTS(print0))
 IF_FEATURE_FIND_TYPE(   ACTS(type,  int type_mask;))
@@ -473,6 +478,22 @@ static int exec_actions(action ***appp, const char *fileName, const struct stat
 }
 
 
+#if !FNM_CASEFOLD
+static char *strcpy_upcase(char *dst, const char *src)
+{
+        char *d = dst;
+        while (1) {
+                unsigned char ch = *src++;
+                if (ch >= 'a' && ch <= 'z')
+                        ch -= ('a' - 'A');
+                *d++ = ch;
+                if (ch == '\0')
+                        break;
+        }
+        return dst;
+}
+#endif
+
 ACTF(name)
 {
         const char *tmp = bb_basename(fileName);
@@ -488,13 +509,25 @@ ACTF(name)
          * but somewhere between 4.1.20 and 4.4.0 GNU find stopped using it.
          * find -name '*foo' should match .foo too:
          */
+#if FNM_CASEFOLD
         return fnmatch(ap->pattern, tmp, (ap->iname ? FNM_CASEFOLD : 0)) == 0;
+#else
+        if (ap->iname)
+                tmp = strcpy_upcase(alloca(strlen(tmp) + 1), tmp);
+        return fnmatch(ap->pattern, tmp, 0) == 0;
+#endif
 }
 
 #if ENABLE_FEATURE_FIND_PATH
 ACTF(path)
 {
+# if FNM_CASEFOLD
+        return fnmatch(ap->pattern, fileName, (ap->ipath ? FNM_CASEFOLD : 0)) == 0;
+# else
+        if (ap->ipath)
+                fileName = strcpy_upcase(alloca(strlen(fileName) + 1), fileName);
         return fnmatch(ap->pattern, fileName, 0) == 0;
+# endif
 }
 #endif
 #if ENABLE_FEATURE_FIND_REGEX
@@ -794,6 +827,7 @@ static action*** parse_params(char **argv)
                                 PARM_name      ,
                                 PARM_iname     ,
         IF_FEATURE_FIND_PATH(   PARM_path      ,)
+        IF_FEATURE_FIND_PATH(   PARM_ipath     ,)
         IF_FEATURE_FIND_REGEX(  PARM_regex     ,)
         IF_FEATURE_FIND_TYPE(   PARM_type      ,)
         IF_FEATURE_FIND_PERM(   PARM_perm      ,)
@@ -831,6 +865,7 @@ static action*** parse_params(char **argv)
                                  "-name\0"
                                  "-iname\0"
         IF_FEATURE_FIND_PATH(   "-path\0"   )
+        IF_FEATURE_FIND_PATH(   "-ipath\0"  )
         IF_FEATURE_FIND_REGEX(  "-regex\0"  )
         IF_FEATURE_FIND_TYPE(   "-type\0"   )
         IF_FEATURE_FIND_PERM(   "-perm\0"   )
@@ -1018,10 +1053,11 @@ static action*** parse_params(char **argv)
                         ap->iname = (parm == PARM_iname);
                 }
 #if ENABLE_FEATURE_FIND_PATH
-                else if (parm == PARM_path) {
+                else if (parm == PARM_path || parm == PARM_ipath) {
                         action_path *ap;
                         ap = ALLOC_ACTION(path);
                         ap->pattern = arg1;
+                        ap->ipath = (parm == PARM_ipath);
                 }
 #endif
 #if ENABLE_FEATURE_FIND_REGEX