vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Import new gnulib.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-11 21:12:46 +02:00
parent 93cd84df63
commit 053cfcddf1
255 changed files with 12578 additions and 4948 deletions
Download patch file Download diff file Expand all files Collapse all files

117
m4/fnmatch.m4
View file

@ -1,6 +1,6 @@
# Check for fnmatch - serial 4.
# Check for fnmatch - serial 9.
# Copyright (C) 2000-2007, 2009-2010 Free Software Foundation, Inc.
# Copyright (C) 2000-2007, 2009-2013 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -20,7 +20,9 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
FNMATCH_H=
gl_fnmatch_required_lowercase=`echo $gl_fnmatch_required | tr 'A-Z' 'a-z'`
gl_fnmatch_required_lowercase=`
echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]'
`
gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}"
AC_CACHE_CHECK([for working $gl_fnmatch_required fnmatch],
[$gl_fnmatch_cache_var],
@ -58,33 +60,62 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
static char const a01[] = { 'a' + 1, 0 };
static char const bs_1[] = { '\\\\' - 1, 0 };
static char const bs01[] = { '\\\\' + 1, 0 };
return
!(n ("a*", "", 0)
&& y ("a*", "abc", 0)
&& n ("d*/*1", "d/s/1", FNM_PATHNAME)
&& y ("a\\\\bc", "abc", 0)
&& n ("a\\\\bc", "abc", FNM_NOESCAPE)
&& y ("*x", ".x", 0)
&& n ("*x", ".x", FNM_PERIOD)
&& y (Apat, "\\\\", 0) && y (Apat, "A", 0)
&& y (apat, "\\\\", 0) && y (apat, "a", 0)
&& n (Apat, A_1, 0) == ('A' < '\\\\')
&& n (apat, a_1, 0) == ('a' < '\\\\')
&& y (Apat, A01, 0) == ('A' < '\\\\')
&& y (apat, a01, 0) == ('a' < '\\\\')
&& y (Apat, bs_1, 0) == ('A' < '\\\\')
&& y (apat, bs_1, 0) == ('a' < '\\\\')
&& n (Apat, bs01, 0) == ('A' < '\\\\')
&& n (apat, bs01, 0) == ('a' < '\\\\')
$gl_fnmatch_gnu_start
&& y ("xxXX", "xXxX", FNM_CASEFOLD)
&& y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)
&& n ("d*/*1", "d/s/1", FNM_FILE_NAME)
&& y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)
&& y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)
&& y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)
$gl_fnmatch_gnu_end
);
int result = 0;
if (!n ("a*", "", 0))
return 1;
if (!y ("a*", "abc", 0))
return 1;
if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */
return 1;
if (!n ("d*/*1", "d/s/1", FNM_PATHNAME))
return 2;
if (!y ("a\\\\bc", "abc", 0))
return 3;
if (!n ("a\\\\bc", "abc", FNM_NOESCAPE))
return 3;
if (!y ("*x", ".x", 0))
return 4;
if (!n ("*x", ".x", FNM_PERIOD))
return 4;
if (!y (Apat, "\\\\", 0))
return 5;
if (!y (Apat, "A", 0))
return 5;
if (!y (apat, "\\\\", 0))
return 5;
if (!y (apat, "a", 0))
return 5;
if (!(n (Apat, A_1, 0) == ('A' < '\\\\')))
return 5;
if (!(n (apat, a_1, 0) == ('a' < '\\\\')))
return 5;
if (!(y (Apat, A01, 0) == ('A' < '\\\\')))
return 5;
if (!(y (apat, a01, 0) == ('a' < '\\\\')))
return 5;
if (!(y (Apat, bs_1, 0) == ('A' < '\\\\')))
return 5;
if (!(y (apat, bs_1, 0) == ('a' < '\\\\')))
return 5;
if (!(n (Apat, bs01, 0) == ('A' < '\\\\')))
return 5;
if (!(n (apat, bs01, 0) == ('a' < '\\\\')))
return 5;
$gl_fnmatch_gnu_start
if (!y ("xxXX", "xXxX", FNM_CASEFOLD))
result |= 8;
if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH))
result |= 16;
if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME))
result |= 32;
if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR))
result |= 64;
if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR))
result |= 64;
if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR))
result |= 64;
$gl_fnmatch_gnu_end
return result;
]])],
[eval "$gl_fnmatch_cache_var=yes"],
[eval "$gl_fnmatch_cache_var=no"],
@ -97,19 +128,9 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
rm -f "$gl_source_base/fnmatch.h"
else
FNMATCH_H=fnmatch.h
AC_LIBOBJ([fnmatch])
dnl We must choose a different name for our function, since on ELF systems
dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
dnl compiled into a shared library.
AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
[Define to a replacement function name for fnmatch().])
dnl Prerequisites of lib/fnmatch.c.
AC_REQUIRE([AC_TYPE_MBSTATE_T])
AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])
AC_CHECK_HEADERS_ONCE([wctype.h])
fi
AC_SUBST([FNMATCH_H])
AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"])
])
# Request a POSIX compliant fnmatch function with GNU extensions.
@ -119,3 +140,17 @@ AC_DEFUN([gl_FUNC_FNMATCH_GNU],
AC_REQUIRE([gl_FUNC_FNMATCH_POSIX])
])
AC_DEFUN([gl_PREREQ_FNMATCH],
[
dnl We must choose a different name for our function, since on ELF systems
dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
dnl compiled into a shared library.
AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
[Define to a replacement function name for fnmatch().])
dnl Prerequisites of lib/fnmatch.c.
AC_REQUIRE([AC_TYPE_MBSTATE_T])
AC_CHECK_DECLS([isblank], [], [], [[#include <ctype.h>]])
AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])
AC_CHECK_HEADERS_ONCE([wctype.h])
])