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

fix cd when user assigns a value to OLDPWD; fix android issue with blocked system calls; fix historical use of test -t; fix issue with foreground-TSTP async jobs

Browse Source
This commit is contained in:
Chet Ramey
2023-07-10 09:41:30 -04:00
parent 6cca378e82
commit 2f09fa19cf
17 changed files with 555 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test.c
+12 -7
View File
@@ -70,6 +70,10 @@ extern int errno;
#endif /* !STREQ */
#define STRCOLLEQ(a, b) ((a)[0] == (b)[0] && strcoll ((a), (b)) == 0)
/* Same as ISOPTION from builtins/common.h */
#define ISPRIMARY(s, c) (s[0] == '-' && s[1] == c && s[2] == '\0')
#define ANDOR(s) (s[0] == '-' && (s[1] == 'a' || s[1] == 'o') && s[2] == 0)
#if !defined (R_OK)
#define R_OK 4
#define W_OK 2
@@ -184,7 +188,7 @@ or (void)
int value, v2;
value = and ();
if (pos < argc && argv[pos][0] == '-' && argv[pos][1] == 'o' && !argv[pos][2])
if (pos < argc && ISPRIMARY (argv[pos], 'o'))
{
advance (0);
v2 = or ();
@@ -205,7 +209,7 @@ and (void)
int value, v2;
value = term ();
if (pos < argc && argv[pos][0] == '-' && argv[pos][1] == 'a' && !argv[pos][2])
if (pos < argc && ISPRIMARY (argv[pos], 'a'))
{
advance (0);
v2 = and ();
@@ -477,7 +481,7 @@ unary_operator (void)
return (FALSE);
/* the only tricky case is `-t', which may or may not take an argument. */
if (op[1] == 't')
if (posixly_correct == 0 && op[1] == 't')
{
advance (0);
if (pos < argc)
@@ -487,10 +491,13 @@ unary_operator (void)
advance (0);
return (unary_test (op, argv[pos - 1], 0));
}
else if (argc >= 5 && ANDOR (argv[pos]))
return (unary_test (op, "1", 0));
else
return (FALSE);
integer_expected_error (argv[pos]);
}
else
/* this is not called when pos == argc; the one-argument code is used */
return (unary_test (op, "1", 0));
}
@@ -603,7 +610,7 @@ unary_test (char *op, char *arg, int flags)
case 't': /* File fd is a terminal? */
if (legal_number (arg, &r) == 0)
return (FALSE);
integer_expected_error (arg);
return ((r == (int)r) && isatty ((int)r));
case 'n': /* True if arg has some length. */
@@ -762,8 +769,6 @@ two_arguments (void)
return (0);
}
#define ANDOR(s) (s[0] == '-' && (s[1] == 'a' || s[1] == 'o') && s[2] == 0)
/* This could be augmented to handle `-t' as equivalent to `-t 1', but
POSIX requires that `-t' be given an argument. */
#define ONE_ARG_TEST(s) ((s)[0] != '\0')