@@ -117,6 +117,8 @@ struct test_case_struct
{ 0, NULL, "$((010+0x10))", 0, 1, { "24" }, IFS },
{ 0, NULL, "$((-010+0x10))", 0, 1, { "8" }, IFS },
{ 0, NULL, "$((-0x10+010))", 0, 1, { "-8" }, IFS },
+ { 0, NULL, "$(())", 0, 1, { "0", }, IFS },
+ { 0, NULL, "$[]", 0, 1, { "0", }, IFS },
/* Advanced parameter expansion */
{ 0, NULL, "${var:-bar}", 0, 1, { "bar", }, IFS },
@@ -138,6 +140,8 @@ struct test_case_struct
{ 0, "12345", "${#var}", 0, 1, { "5", }, IFS },
{ 0, NULL, "${var:-'}'}", 0, 1, { "}", }, IFS },
{ 0, NULL, "${var-}", 0, 0, { NULL }, IFS },
+ { 0, NULL, "${a?}", 0, 0, { NULL, }, IFS },
+ { 0, NULL, "${#a=}", 0, 1, { "0", }, IFS },
{ 0, "pizza", "${var#${var}}", 0, 0, { NULL }, IFS },
{ 0, "pepperoni", "${var%$(echo oni)}", 0, 1, { "pepper" }, IFS },
@@ -720,7 +720,7 @@ parse_arith (char **word, size_t *word_length, size_t *max_length,
++(*offset);
/* Go - evaluate. */
- if (*expr && eval_expr (expr, &numresult) != 0)
+ if (expr && eval_expr (expr, &numresult) != 0)
{
free (expr);
return WRDE_SYNTAX;
@@ -758,7 +758,7 @@ parse_arith (char **word, size_t *word_length, size_t *max_length,
long int numresult = 0;
/* Go - evaluate. */
- if (*expr && eval_expr (expr, &numresult) != 0)
+ if (expr && eval_expr (expr, &numresult) != 0)
{
free (expr);
return WRDE_SYNTAX;
@@ -1790,7 +1790,7 @@ envsubst:
{
const char *str = pattern;
- if (str[0] == '\0')
+ if (!str || str[0] == '\0')
str = _("parameter null or not set");
__fxprintf (NULL, "%s: %s\n", env, str);
@@ -1813,7 +1813,7 @@ envsubst:
goto success;
value = pattern ? __strdup (pattern) : pattern;
- free_value = 1;
+ free_value = !!pattern;
if (pattern && !value)
goto no_space;
@@ -1827,7 +1827,7 @@ envsubst:
free (value);
value = pattern ? __strdup (pattern) : pattern;
- free_value = 1;
+ free_value = !!pattern;
if (pattern && !value)
goto no_space;
@@ -1857,7 +1857,7 @@ envsubst:
free (value);
value = pattern ? __strdup (pattern) : pattern;
- free_value = 1;
+ free_value = !!pattern;
if (pattern && !value)
goto no_space;