Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

find: cater for libc w/o FNM_CASEFOLD

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-05-23 00:40:54 +02:00
parent 7948ecb505
commit b24ef035bd
4 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
findutils/find.c
View File

@ -330,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! */
@ -474,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);
@ -489,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

1
libbb/Kbuild.src
View File

@ -13,7 +13,6 @@ INSERT
lib-y += appletlib.o
lib-y += ask_confirmation.o
lib-y += bb_askpass.o
lib-y += bb_basename.o
lib-y += bb_bswap_64.o
lib-y += bb_do_delay.o
lib-y += bb_pwd.o

18
libbb/bb_basename.c
View File

@ -1,18 +0,0 @@
/* vi: set sw=4 ts=4: */
/*
* Utility routines.
*
* Copyright (C) 2007 Denys Vlasenko
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
#include "libbb.h"
const char* FAST_FUNC bb_basename(const char *name)
{
const char *cp = strrchr(name, '/');
if (cp)
return cp + 1;
return name;
}

10
libbb/get_last_path_component.c
View File

@ -6,8 +6,16 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
#include "libbb.h"
const char* FAST_FUNC bb_basename(const char *name)
{
const char *cp = strrchr(name, '/');
if (cp)
return cp + 1;
return name;
}
/*
* "/" -> "/"
* "abc" -> "abc"