Merge remote-tracking branch 'upstream/master' into palloc

Author: jpco

access.c

@@ -29,10 +29,12 @@ static Boolean ingroupset(gidset_t gid) {
 	static gidset_t *gidset;
 	static Boolean initialized = FALSE;
 	if (!initialized) {
-		initialized = TRUE;
-		ngroups = getgroups(0, gidset);
+		ngroups = getgroups(0, NULL);
+		if (ngroups == -1)
+			fail("$&access", "getgroups: %s", esstrerror(errno));
 		gidset = ealloc(ngroups * sizeof(gidset_t));
-		getgroups(ngroups, gidset);
+		assert(getgroups(ngroups, gidset) != -1);
+		initialized = TRUE;
 	}
 	for (i = 0; i < ngroups; i++)
 		if (gid == gidset[i])

prim-io.c

@@ -180,7 +180,8 @@ PRIM(here) {
 	Ref(List *, cmd, tail);
 #ifdef PIPE_BUF
 	if (doclen <= PIPE_BUF) {
-		pipe(p);
+		if (pipe(p) == -1)
+			fail("$&here", "pipe: %s", esstrerror(errno));
 		ewrite(p[1], doc, doclen);
 	} else
 #endif

test/tests/regression.es

@@ -89,6 +89,9 @@ EOF
 
 	# https://github.com/wryun/es-shell/issues/199
 	assert {~ `` \n {echo 'fn-%write-history = $&collect'^\n^'cat << eof' | $es -i >[2=1]} *'incomplete here document'*}
+
+	# https://github.com/wryun/es-shell/issues/206
+	assert {~ `` \n {$es -c 'let (a=<=true) echo $a'} <=true} 'concatenated assignment+call syntax works'
 }
 
 # These tests are based on notes in the CHANGES file from the pre-git days.

token.c

@@ -347,9 +347,10 @@ extern int yylex(YYSTYPE *y) {
 				cmd = "%here";
 			} else
 				cmd = "%heredoc";
-		else if (c == '=')
+		else if (c == '=') {
+			input->ws = NW;
 			return CALL;
-		else
+		} else
 			cmd = "%open";
 		goto redirection;
 	case '>':