alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update to gnulib d77a23b15925e5554325ea3553c940133734eee3

Browse source 
* configure.ac: Update minimum autoconf version.
* lib/config.charset, lib/ref-add.sin, lib/ref-del.sin,
m4/closeout.m4, m4/close-stream.m4, m4/configmake.m4, m4/glibc21.m4,
m4/hard-locale.m4: Remove.
* lib/alloca.c, lib/alloca.in.h, lib/argmatch.c, lib/argmatch.h,
lib/arg-nonnull.h, lib/argp-ba.c, lib/argp-eexst.c,
lib/argp-fmtstream.c, lib/argp-fmtstream.h, lib/argp-fs-xinl.c,
lib/argp.h, lib/argp-help.c, lib/argp-namefrob.h, lib/argp-parse.c,
lib/argp-pin.c, lib/argp-pv.c, lib/argp-pvh.c, lib/argp-xinl.c,
lib/asnprintf.c, lib/basename-lgpl.c, lib/c-ctype.h, lib/c++defs.h,
lib/closeout.c, lib/closeout.h, lib/close-stream.c,
lib/c-strcasecmp.c, lib/c-strcaseeq.h, lib/c-strcase.h,
lib/c-strncasecmp.c, lib/dirname.h, lib/dirname-lgpl.c, lib/dosname.h,
lib/errno.in.h, lib/error.c, lib/error.h, lib/exitfail.c,
lib/exitfail.h, lib/fcntl.in.h, lib/filename.h, lib/float.c,
lib/float+.h, lib/float.in.h, lib/fpending.c, lib/fpending.h,
lib/getopt1.c, lib/getopt.c, lib/getopt-cdefs.in.h, lib/getopt-core.h,
lib/getopt-ext.h, lib/getopt.in.h, lib/getopt_int.h,
lib/getopt-pfx-core.h, lib/getopt-pfx-ext.h, lib/getprogname.c,
lib/getprogname.h, lib/gettext.h, lib/gettimeofday.c,
lib/hard-locale.c, lib/hard-locale.h, lib/intprops.h, lib/isatty.c,
lib/itold.c, lib/limits.in.h, lib/localcharset.c, lib/localcharset.h,
lib/localtime-buffer.c, lib/localtime-buffer.h, lib/lstat.c,
lib/Makefile.am, lib/malloca.c, lib/malloca.h, lib/malloc.c,
lib/mbrtowc.c, lib/mbsinit.c, lib/memchr.c, lib/memchr.valgrind,
lib/mempcpy.c, lib/minmax.h, lib/mkstemp.c, lib/mkstemps.c,
lib/msvc-inval.c, lib/msvc-inval.h, lib/msvc-nothrow.c,
lib/msvc-nothrow.h, lib/_Noreturn.h, lib/pathmax.h, lib/printf-args.c,
lib/printf-args.h, lib/printf-parse.c, lib/printf-parse.h,
lib/progname.c, lib/progname.h, lib/quotearg.c, lib/quotearg.h,
lib/quote.h, lib/rawmemchr.c, lib/rawmemchr.valgrind,
lib/secure_getenv.c, lib/size_max.h, lib/sleep.c, lib/stat.c,
lib/stat-time.h, lib/stat-w32.c, lib/stat-w32.h, lib/stdalign.in.h,
lib/stdbool.in.h, lib/stddef.in.h, lib/stdint.in.h, lib/stdio-impl.h,
lib/stdio.in.h, lib/stdlib.in.h, lib/stpcpy.c, lib/strcasecmp.c,
lib/strchrnul.c, lib/strchrnul.valgrind, lib/streq.h, lib/strerror.c,
lib/strerror-override.c, lib/strerror-override.h, lib/string.in.h,
lib/strings.in.h, lib/stripslash.c, lib/strncasecmp.c, lib/strndup.c,
lib/strnlen.c, lib/strverscmp.c, lib/sysexits.in.h, lib/sys_stat.in.h,
lib/sys_time.in.h, lib/sys_types.in.h, lib/sys_wait.in.h,
lib/tempname.c, lib/tempname.h, lib/time.in.h, lib/unistd.in.h,
lib/vasnprintf.c, lib/vasnprintf.h, lib/verify.h, lib/vsnprintf.c,
lib/warn-on-use.h, lib/wchar.in.h, lib/wctype.in.h, lib/xalloc-die.c,
lib/xalloc.h, lib/xalloc-oversized.h, lib/xmalloc.c, lib/xsize.h,
m4/00gnulib.m4, m4/absolute-header.m4, m4/alloca.m4, m4/argp.m4,
m4/codeset.m4, m4/dirname.m4, m4/double-slash-root.m4, m4/eealloc.m4,
m4/errno_h.m4, m4/error.m4, m4/exponentd.m4, m4/extensions.m4,
m4/extern-inline.m4, m4/fcntl_h.m4, m4/fcntl-o.m4, m4/float_h.m4,
m4/fpending.m4, m4/getopt.m4, m4/getprogname.m4, m4/gettimeofday.m4,
m4/gnulib-cache.m4, m4/gnulib-common.m4, m4/gnulib-comp.m4,
m4/gnulib-tool.m4, m4/include_next.m4, m4/intmax_t.m4,
m4/inttypes_h.m4, m4/isatty.m4, m4/largefile.m4, m4/limits-h.m4,
m4/localcharset.m4, m4/locale-fr.m4, m4/locale-ja.m4, m4/locale-zh.m4,
m4/localtime-buffer.m4, m4/longlong.m4, m4/lstat.m4, m4/malloca.m4,
m4/malloc.m4, m4/math_h.m4, m4/mbrtowc.m4, m4/mbsinit.m4,
m4/mbstate_t.m4, m4/memchr.m4, m4/mempcpy.m4, m4/minmax.m4,
m4/mkstemp.m4, m4/mkstemps.m4, m4/mmap-anon.m4, m4/msvc-inval.m4,
m4/msvc-nothrow.m4, m4/multiarch.m4, m4/nocrash.m4, m4/off_t.m4,
m4/pathmax.m4, m4/printf.m4, m4/quotearg.m4, m4/quote.m4,
m4/rawmemchr.m4, m4/secure_getenv.m4, m4/size_max.m4, m4/sleep.m4,
m4/ssize_t.m4, m4/stat.m4, m4/stat-time.m4, m4/stdalign.m4,
m4/stdbool.m4, m4/stddef_h.m4, m4/stdint_h.m4, m4/stdint.m4,
m4/stdio_h.m4, m4/stdlib_h.m4, m4/stpcpy.m4, m4/strcase.m4,
m4/strchrnul.m4, m4/strerror.m4, m4/string_h.m4, m4/strings_h.m4,
m4/strndup.m4, m4/strnlen.m4, m4/strverscmp.m4, m4/sysexits.m4,
m4/sys_socket_h.m4, m4/sys_stat_h.m4, m4/sys_time_h.m4,
m4/sys_types_h.m4, m4/sys_wait_h.m4, m4/tempname.m4, m4/time_h.m4,
m4/unistd_h.m4, m4/vasnprintf.m4, m4/vsnprintf.m4, m4/warn-on-use.m4,
m4/wchar_h.m4, m4/wchar_t.m4, m4/wctype_h.m4, m4/wint_t.m4,
m4/xalloc.m4, m4/xsize.m4: Update.
* lib/cdefs.h, lib/glthread/lock.c, lib/glthread/lock.h,
lib/glthread/threadlib.c, lib/libc-config.h, lib/mkdir.c,
lib/windows-initguard.h, lib/windows-mutex.c, lib/windows-mutex.h,
lib/windows-once.c, lib/windows-once.h, lib/windows-recmutex.c,
lib/windows-recmutex.h, lib/windows-rwlock.c, lib/windows-rwlock.h,
m4/host-cpu-c-abi.m4, m4/__inline.m4, m4/lib-ld.m4, m4/lib-link.m4,
m4/lib-prefix.m4, m4/lock.m4, m4/mkdir.m4,
m4/pthread_rwlock_rdlock.m4, m4/std-gnu11.m4, m4/threadlib.m4,
tools/config.rpath: New files.
This commit is contained in:
Alexandre Duret-Lutz 2019-09-10 16:30:42 +02:00
parent 25eb9d4979
commit 8868bc67ba
281 changed files with 10229 additions and 2357 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/argmatch.c
View file

@ -1,6 +1,6 @@
/* argmatch.c -- find a match for a string in an array
Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2018 Free Software
Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@ -29,12 +29,10 @@
#include <stdlib.h>
#include <string.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "error.h"
#include "quotearg.h"
#include "quote.h"
#include "getprogname.h"
#if USE_UNLOCKED_IO
@ -82,7 +80,7 @@ argmatch_exit_fn argmatch_die = __argmatch_die;
ptrdiff_t
argmatch (const char *arg, const char *const *arglist,
const char *vallist, size_t valsize)
const void *vallist, size_t valsize)
{
size_t i; /* Temporary index in ARGLIST. */
size_t arglen; /* Length of ARG. */
@ -106,8 +104,8 @@ argmatch (const char *arg, const char *const *arglist,
{
/* Second nonexact match found. */
if (vallist == NULL
|| memcmp (vallist + valsize * matchind,
vallist + valsize * i, valsize))
|| memcmp ((char const *) vallist + valsize * matchind,
(char const *) vallist + valsize * i, valsize))
{
/* There is a real ambiguity, or we could not
disambiguate. */
@ -144,7 +142,7 @@ argmatch_invalid (const char *context, const char *value, ptrdiff_t problem)
VALSIZE is the size of the elements of VALLIST */
void
argmatch_valid (const char *const *arglist,
const char *vallist, size_t valsize)
const void *vallist, size_t valsize)
{
size_t i;
const char *last_val = NULL;
@ -154,10 +152,10 @@ argmatch_valid (const char *const *arglist,
fputs (_("Valid arguments are:"), stderr);
for (i = 0; arglist[i]; i++)
if ((i == 0)
|| memcmp (last_val, vallist + valsize * i, valsize))
|| memcmp (last_val, (char const *) vallist + valsize * i, valsize))
{
fprintf (stderr, "\n - %s", quote (arglist[i]));
last_val = vallist + valsize * i;
last_val = (char const *) vallist + valsize * i;
}
else
{
@ -175,7 +173,7 @@ argmatch_valid (const char *const *arglist,
ptrdiff_t
__xargmatch_internal (const char *context,
const char *arg, const char *const *arglist,
const char *vallist, size_t valsize,
const void *vallist, size_t valsize,
argmatch_exit_fn exit_fn)
{
ptrdiff_t res = argmatch (arg, arglist, vallist, valsize);
@ -194,14 +192,14 @@ __xargmatch_internal (const char *context,
/* Look for VALUE in VALLIST, an array of objects of size VALSIZE and
return the first corresponding argument in ARGLIST */
const char *
argmatch_to_argument (const char *value,
argmatch_to_argument (const void *value,
const char *const *arglist,
const char *vallist, size_t valsize)
const void *vallist, size_t valsize)
{
size_t i;
for (i = 0; arglist[i]; i++)
if (!memcmp (value, vallist + valsize * i, valsize))
if (!memcmp (value, (char const *) vallist + valsize * i, valsize))
return arglist[i];
return NULL;
}