fix for fdflags loadable builtin; new strptime loadable builtin; enable -f doesn't fall back to current directory if using BASH_LOADABLES_PATH; new operator for rl_complete_internal that just dumps possible completions

This commit is contained in:
Chet Ramey
2023-11-24 12:39:17 -05:00
parent f491b93350
commit 55a224da44
35 changed files with 1613 additions and 1078 deletions
+1 -1
View File
@@ -63,7 +63,7 @@ ARFLAGS = @ARFLAGS@
LOCAL_DEFS = @LOCAL_DEFS@
DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL -DBUILDING_LIBINTL
-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL -DBUILDING_LIBINTL @DEFS@
# XXX - use this?
RELOCATABLE_DEFS = -DENABLE_RELOCATABLE=1 -DIN_LIBRARY \
+1 -1
View File
@@ -290,7 +290,7 @@ local_wcsnlen (const wchar_t *s, size_t maxlen)
static size_t
wctomb_fallback (char *s, wchar_t wc)
{
static char hex[16] = "0123456789ABCDEF";
static char const hex[16] = "0123456789ABCDEF";
s[0] = '\\';
if (sizeof (wchar_t) > 2 && wc > 0xffff)
+6
View File
@@ -997,10 +997,13 @@ internal_free (PTR_T mem, const char *file, int line, int flags)
#if defined (USE_MMAP)
if (nunits > malloc_mmap_threshold)
{
int o;
o = errno;
munmap (p, binsize (nunits));
#if defined (MALLOC_STATS)
_mstats.nlesscore[nunits]++;
#endif
errno = o; /* POSIX says free preserves errno */
goto free_return;
}
#endif
@@ -1015,7 +1018,10 @@ internal_free (PTR_T mem, const char *file, int line, int flags)
there's already a block on the free list. */
if ((nunits >= LESSCORE_FRC) || busy[nunits] || nextf[nunits] != 0)
{
int o;
o = errno;
lesscore (nunits);
errno = o;
/* keeps the tracing and registering code in one place */
goto free_return;
}
+80
View File
@@ -0,0 +1,80 @@
/* Copyright (C) 2023 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
Bash is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Bash is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Bash. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include <unistd.h>
#include <errno.h>
#if defined (HAVE_BRK) && !defined (HAVE_SBRK)
static void *initialbrk;
static void *curbrk;
static int
brkinit (void)
{
if (initialbrk == 0)
{
void *b;
b = brk (NULL);
if (b == (void *)-1)
return -1;
initialbrk = curbrk = b;
}
return (0);
}
/* sbrk(3) implementation in terms of brk(2). Good enough for malloc to use. */
void *
sbrk (intptr_t incr)
{
void *newbrk, *oldbrk;
if (initialbrk == 0 && initbrk () == -1)
{
errno = ENOMEM;
return (void *)-1;
}
if (incr == 0)
return curbrk;
/* bounds checking, overflow */
if ((incr > 0 && (uintptr_t) curbrk + incr < (uintptr_t) curbrk) ||
(incr < 0 && (uintptr_t) curbrk + incr > (uintptr_t) curbrk))
{
errno = ENOMEM;
return (void *)-1;
}
newbrk = curbrk + incr;
if (newbrk < initialbrk)
{
errno = EINVAL;
return (void *)-1;
}
if (brk (newbrk) == (void *)-1)
return (void *)-1; /* preserve errno */
oldbrk = curbrk;
curbrk = newbrk;
return (oldbrk);
}
#endif /* HAVE_BRK && !HAVE_SBRK */
+2 -1
View File
@@ -2190,7 +2190,8 @@ rl_complete_internal (int what_to_do)
}
/*FALLTHROUGH*/
case '%':
case '%': /* used by menu_complete */
case '|': /* add this for unconditional display */
do_display = 1;
break;
+2 -2
View File
@@ -54,8 +54,8 @@
extern int errno;
#endif
#define x_digs "0123456789abcdef"
#define X_digs "0123456789ABCDEF"
static char const x_digs[16] = "0123456789abcdef";
static char const X_digs[16] = "0123456789ABCDEF";
static char * const all_digs = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@_";
-3
View File
@@ -173,9 +173,6 @@ extern char *fmtullong (unsigned long long int, int, char *, size_t, int);
#define ASBUFSIZE 128
#define x_digs "0123456789abcdef"
#define X_digs "0123456789ABCDEF"
static char intbuf[INT_STRLEN_BOUND(unsigned long) + 1];
static int decpoint;