pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-08-12 05:00:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix typo in readline custom LS_COLORS extension; fix so `time' is recognized as a reserved word after $( and ${; don't run traps while parsing a command substitution

Browse Source
This commit is contained in:
Chet Ramey
2023-09-07 17:09:24 -04:00
parent f4683835d8
commit aab2c1fb1d
17 changed files with 2751 additions and 2650 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builtins/printf.def
+39 -29
View File
@@ -380,7 +380,7 @@ printf_builtin (WORD_LIST *list)
if (*fmt != '%')
{
PC (*fmt);
PC (*fmt); /* should print entire multibyte char here */
continue;
}
@@ -465,11 +465,12 @@ printf_builtin (WORD_LIST *list)
switch(convch)
{
case 'c':
case 'C':
{
char p;
#if defined (HANDLE_MULTIBYTE)
if (longform)
if (longform || convch == 'C')
{
wchar_t wc, ws[2];
int r;
@@ -490,10 +491,11 @@ printf_builtin (WORD_LIST *list)
}
case 's':
case 'S':
{
char *p;
#if defined (HANDLE_MULTIBYTE)
if (longform)
if (longform || convch == 'S')
{
wchar_t *wp;
size_t slen;
@@ -507,8 +509,38 @@ printf_builtin (WORD_LIST *list)
break;
}
#endif
#if 0 /*TAG:bash-5.4*/
if (altform == 0)
#endif
{
p = getstr ();
PF(start, p);
break;
}
}
/*FALLTHROUGH*/
case 'b': /* expand escapes in argument */
{
char *p, *xp;
int rlen, r;
p = getstr ();
PF(start, p);
ch = rlen = r = 0;
xp = bexpand (p, strlen (p), &ch, &rlen);
if (xp)
{
/* Have to use printstr because of possible NUL bytes
in XP -- printf does not handle that well. */
r = printstr (start, xp, rlen, fieldwidth, precision);
if (r < 0)
retval = EXECUTION_FAILURE;
free (xp);
}
if (ch || r < 0)
PRETURN (retval);
break;
}
@@ -600,30 +632,6 @@ printf_builtin (WORD_LIST *list)
break;
}
case 'b': /* expand escapes in argument */
{
char *p, *xp;
int rlen, r;
p = getstr ();
ch = rlen = r = 0;
xp = bexpand (p, strlen (p), &ch, &rlen);
if (xp)
{
/* Have to use printstr because of possible NUL bytes
in XP -- printf does not handle that well. */
r = printstr (start, xp, rlen, fieldwidth, precision);
if (r < 0)
retval = EXECUTION_FAILURE;
free (xp);
}
if (ch || r < 0)
PRETURN (retval);
break;
}
case 'q': /* print with shell quoting */
case 'Q':
{
@@ -1162,7 +1170,7 @@ bexpand (char *string, int len, int *sawc, int *lenp)
#else
ret = (char *)xmalloc (len + 1);
#endif
temp = 0;
for (r = ret, s = string; s && *s; )
{
c = *s++;
@@ -1171,6 +1179,8 @@ bexpand (char *string, int len, int *sawc, int *lenp)
*r++ = c;
continue;
}
/* output entire multibyte character here? */
temp = 0;
#if defined (HANDLE_MULTIBYTE)
memset (mbch, '\0', sizeof (mbch));