svn commit: r318269 - in head/bin/sh: . tests/builtins

[Jilles Tjoelker]

Author: jilles
Date: Sun May 14 13:14:19 2017
New Revision: 318269
URL: https://svnweb.freebsd.org/changeset/base/318269

Log:
  sh: Fix '-' from quoted arithmetic in case/glob pattern range.
  
  It does not make much sense to generate the '-' in a pattern bracket
  expression using arithmetic expansion, but it does not make sense to forbid
  it either.
  
  Try to avoid reprocessing the string if it is unnecessary.

Added:
  head/bin/sh/tests/builtins/case22.0   (contents, props changed)
Modified:
  head/bin/sh/expand.c
  head/bin/sh/tests/builtins/Makefile

Modified: head/bin/sh/expand.c
==============================================================================
--- head/bin/sh/expand.c	Sun May 14 12:41:58 2017	(r318268)
+++ head/bin/sh/expand.c	Sun May 14 13:14:19 2017	(r318269)
@@ -440,8 +440,15 @@ expari(const char *p, struct nodelist **
 	fmtstr(expdest, DIGITS(result), ARITH_FORMAT_STR, result);
 	adj = strlen(expdest);
 	STADJUST(adj, expdest);
-	if (!quoted)
-		reprocess(expdest - adj - stackblock(), flag, VSNORMAL, 0, dst);
+	/*
+	 * If this is quoted, a '-' must not indicate a range in [...].
+	 * If this is not quoted, splitting may occur.
+	 */
+	if (quoted ?
+	    result < 0 && begoff > 1 && flag & (EXP_GLOB | EXP_CASE) :
+	    flag & EXP_SPLIT)
+		reprocess(expdest - adj - stackblock(), flag, VSNORMAL, quoted,
+		    dst);
 	return p;
 }
 

Modified: head/bin/sh/tests/builtins/Makefile
==============================================================================
--- head/bin/sh/tests/builtins/Makefile	Sun May 14 12:41:58 2017	(r318268)
+++ head/bin/sh/tests/builtins/Makefile	Sun May 14 13:14:19 2017	(r318269)
@@ -41,6 +41,7 @@ ${PACKAGE}FILES+=		case18.0
 ${PACKAGE}FILES+=		case19.0
 ${PACKAGE}FILES+=		case20.0
 ${PACKAGE}FILES+=		case21.0
+${PACKAGE}FILES+=		case22.0
 ${PACKAGE}FILES+=		cd1.0
 ${PACKAGE}FILES+=		cd2.0
 ${PACKAGE}FILES+=		cd3.0

Added: head/bin/sh/tests/builtins/case22.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/bin/sh/tests/builtins/case22.0	Sun May 14 13:14:19 2017	(r318269)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+case 5 in
+[0"$((-9))"]) echo bad1 ;;
+esac
+
+case - in
+[0"$((-9))"]) ;;
+*) echo bad2 ;;
+esac