gnu/wget2
1
0
Fork 0
mirror of https://gitlab.com/gnuwget/wget2.git synced 2026-02-01 04:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add gnulib modules c-strcase, c-ctype and strcase

Browse Source 
* autogen.sh: Add gnulib modules c-strcase, c-ctype and strcase
* configure.ac: Remove search for string.h, strings.h, str(n)casecmp
* libwget/utils.c: Use c_str(n)casecmp, c_isupper, c_isxdigit
This commit is contained in:
Tim Rühsen
2016-01-11 16:23:07 +01:00
parent da6ac3d144
commit d1e0a2e98d
3 changed files with 18 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
autogen.sh
View File

@ -31,6 +31,8 @@ $GIT submodule init
$GIT submodule update
gnulib_modules="
c-strcase
c-ctype
clock-time
dup2
fcntl
@ -39,6 +41,7 @@ fnmatch
futimens
glob
nanosleep
strcase
strdup
strndup
"

9
configure.ac
View File

@ -358,8 +358,8 @@ AM_CONDITIONAL([WITH_LIBIDN], [test "x$with_libidn" = xyes])
# Checks for header files.
AC_CHECK_HEADERS([\
inttypes.h libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h\
strings.h sys/socket.h sys/time.h unistd.h crypt.h poll.h sys/poll.h idna.h idn/idna.h idn2.h stringprep.h\
inttypes.h libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h\
sys/socket.h sys/time.h unistd.h crypt.h poll.h sys/poll.h idna.h idn/idna.h idn2.h stringprep.h\
langinfo.h unicase.h])
# Checks for typedefs, structures, and compiler characteristics.
@ -384,9 +384,8 @@ AC_FUNC_FORK
AC_FUNC_MMAP
#AC_FUNC_REALLOC
AC_CHECK_FUNCS([\
memchr memmove memset mkdir munmap select setlocale socket strcasecmp\
strchr strerror strncasecmp strrchr strstr strlcpy \
vasprintf nl_langinfo pwrite qsort_r])
memchr memmove memset mkdir munmap select setlocale socket\
strchr strerror strrchr strstr strlcpy vasprintf nl_langinfo pwrite qsort_r])
# BSD / OSX have a qsort_r with swapped arguments
if test x$ac_cv_func_qsort_r = xyes ; then

76
libwget/utils.c
View File

@ -34,7 +34,9 @@
#include <strings.h>
#include <unistd.h>
#include <time.h>
#include <ctype.h>
#include "c-ctype.h"
#include "c-strcase.h"
#include <libwget.h>
#include "private.h"
@ -104,40 +106,6 @@ int wget_strcasecmp(const char *s1, const char *s2)
}
}
/*
static const char _upper[256] = {
['a'] = 'A', ['b'] = 'B', ['c'] = 'C', ['d'] = 'D',
['e'] = 'E', ['f'] = 'F', ['g'] = 'G', ['h'] = 'H',
['i'] = 'I', ['j'] = 'J', ['k'] = 'K', ['l'] = 'L',
['m'] = 'M', ['n'] = 'N', ['o'] = 'O', ['p'] = 'P',
['q'] = 'Q', ['r'] = 'R', ['s'] = 'S', ['t'] = 'T',
['u'] = 'U', ['v'] = 'V', ['w'] = 'W', ['x'] = 'X',
['y'] = 'Y', ['z'] = 'Z', ['A'] = 'A', ['B'] = 'B',
['C'] = 'C', ['D'] = 'D', ['E'] = 'E', ['F'] = 'F',
['G'] = 'G', ['H'] = 'H', ['I'] = 'I', ['J'] = 'J',
['K'] = 'K', ['L'] = 'L', ['M'] = 'M', ['N'] = 'N',
['O'] = 'O', ['P'] = 'P', ['Q'] = 'Q', ['R'] = 'R',
['S'] = 'S', ['T'] = 'T', ['U'] = 'U', ['V'] = 'V',
['W'] = 'W', ['X'] = 'X', ['Y'] = 'Y', ['Z'] = 'Z',
};
*/
static const char _lower[256] = {
['a'] = 'a', ['b'] = 'b', ['c'] = 'c', ['d'] = 'd',
['e'] = 'e', ['f'] = 'f', ['g'] = 'g', ['h'] = 'h',
['i'] = 'i', ['j'] = 'j', ['k'] = 'k', ['l'] = 'l',
['m'] = 'm', ['n'] = 'n', ['o'] = 'o', ['p'] = 'p',
['q'] = 'q', ['r'] = 'r', ['s'] = 's', ['t'] = 't',
['u'] = 'u', ['v'] = 'v', ['w'] = 'w', ['x'] = 'x',
['y'] = 'y', ['z'] = 'z', ['A'] = 'a', ['B'] = 'b',
['C'] = 'c', ['D'] = 'd', ['E'] = 'e', ['F'] = 'f',
['G'] = 'g', ['H'] = 'h', ['I'] = 'i', ['J'] = 'j',
['K'] = 'k', ['L'] = 'l', ['M'] = 'm', ['N'] = 'n',
['O'] = 'o', ['P'] = 'p', ['Q'] = 'q', ['R'] = 'r',
['S'] = 's', ['T'] = 't', ['U'] = 'u', ['V'] = 'v',
['W'] = 'w', ['X'] = 'x', ['Y'] = 'y', ['Z'] = 'z',
};
/**
* wget_strcasecmp_ascii:
* @s1: String
@ -163,17 +131,8 @@ int wget_strcasecmp_ascii(const char *s1, const char *s2)
} else {
if (!s2)
return 1;
else {
while (*s1 && (*s1 == *s2 || (_lower[(unsigned)*s1] && _lower[(unsigned)*s1] == _lower[(unsigned)*s2]))) {
s1++;
s2++;
}
if (_lower[(unsigned)*s1] && _lower[(unsigned)*s2])
return _lower[(unsigned)*s1] - _lower[(unsigned)*s2];
else
return *s1 - *s2;
}
else
return c_strcasecmp(s1, s2);
}
}
@ -203,21 +162,8 @@ int wget_strncasecmp_ascii(const char *s1, const char *s2, size_t n)
} else {
if (!s2)
return 1;
else {
while ((ssize_t)(n--) > 0 && *s1 && (*s1 == *s2 || (_lower[(unsigned)*s1] && _lower[(unsigned)*s1] == _lower[(unsigned)*s2]))) {
s1++;
s2++;
}
if ((ssize_t)n >= 0) {
if (_lower[(unsigned)*s1] && _lower[(unsigned)*s2])
return _lower[(unsigned)*s1] - _lower[(unsigned)*s2];
else
return *s1 - *s2;
}
return 0;
}
else
return c_strncasecmp(s1, s2, n);
}
}
@ -232,9 +178,9 @@ int wget_strncasecmp_ascii(const char *s1, const char *s2, size_t n)
char *wget_strtolower(char *s)
{
if (s) {
for (unsigned char *u = (unsigned char *)s; *u; u++) {
if (_lower[*u])
*u = _lower[*u];
for (char *d = s; *d; d++) {
if (c_isupper(*d))
*d = c_tolower(*d);
}
}
@ -366,7 +312,7 @@ int wget_percent_unescape(char *_src)
while (*src) {
if (*src == '%') {
if (isxdigit(src[1]) && isxdigit(src[2])) {
if (c_isxdigit(src[1]) && c_isxdigit(src[2])) {
*dst++ = (_unhex(src[1]) << 4) | _unhex(src[2]);
src += 3;
ret = 1;