From owner-svn-src-all@FreeBSD.ORG Wed Oct 29 02:17:50 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D84CFF99; Wed, 29 Oct 2014 02:17:50 +0000 (UTC) Received: from mail-la0-x231.google.com (mail-la0-x231.google.com [IPv6:2a00:1450:4010:c03::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7FCCFAD7; Wed, 29 Oct 2014 02:17:49 +0000 (UTC) Received: by mail-la0-f49.google.com with SMTP id ge10so1703176lab.22 for ; Tue, 28 Oct 2014 19:17:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=G1NmCA2VsNfAUmDMKaPSEUNMwRnXbVSL5y7rqFLI71U=; b=ZBbdaLXbUfjHUTkUBNWNNJhoV8O9iedtbO3RL2g0HifZIsHD+GggbJQGiTmW6zAlHo gaQdz31goZFetlC3RZjqW+P1qRM3Zxc7x44J3RIupddX9m6wmg6/rbBsByYMs58kN0Th oDFWIe9VV7S6mHiBATLCDBH4NHlA+RuyA6jq+I3qtq9YIKCxABuupUq856nbm3w8FnbM zjt0huwPm6HhpQvmR+FznKmA3aCJfk/IQQtF2gvuDdxYaiowlONqrJrpq7NDfjgkxRjZ mZjVxBhRpdQUa368bNlY5jsL9r4OKAvtqstBPLWPmqv+FHCIXpZAE8HslttsnDGVFA+E haSw== MIME-Version: 1.0 X-Received: by 10.112.150.68 with SMTP id ug4mr8032550lbb.82.1414549067357; Tue, 28 Oct 2014 19:17:47 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.112.84.197 with HTTP; Tue, 28 Oct 2014 19:17:47 -0700 (PDT) Received: by 10.112.84.197 with HTTP; Tue, 28 Oct 2014 19:17:47 -0700 (PDT) In-Reply-To: <201410282214.s9SMEWFD007584@svn.freebsd.org> References: <201410282214.s9SMEWFD007584@svn.freebsd.org> Date: Tue, 28 Oct 2014 19:17:47 -0700 X-Google-Sender-Auth: jnIVlJvpOGq3PYy9qF9UPk5hV4Y Message-ID: Subject: Re: svn commit: r273802 - in head/bin/sh: . tests/parameters From: Craig Rodrigues To: Jilles Tjoelker Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, jenkins-admin@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 02:17:51 -0000 Hi, The tests started failing after this commit. Can you take a look? https://jenkins.freebsd.org/jenkins/job/FreeBSD_HEAD-tests2/143/console -- Craig On Oct 28, 2014 3:14 PM, "Jilles Tjoelker" wrote: > Author: jilles > Date: Tue Oct 28 22:14:31 2014 > New Revision: 273802 > URL: https://svnweb.freebsd.org/changeset/base/273802 > > Log: > Treat IFS separators in "$*" as quoted. > > This makes a difference if IFS starts with *, ?, [ or a CTL* byte. > > Added: > head/bin/sh/tests/parameters/positional6.0 (contents, props changed) > head/bin/sh/tests/parameters/positional7.0 (contents, props changed) > Modified: > head/bin/sh/expand.c > head/bin/sh/tests/parameters/Makefile > > Modified: head/bin/sh/expand.c > > ============================================================================== > --- head/bin/sh/expand.c Tue Oct 28 21:06:04 2014 (r273801) > +++ head/bin/sh/expand.c Tue Oct 28 22:14:31 2014 (r273802) > @@ -878,7 +878,7 @@ varvalue(const char *name, int quoted, i > int num; > char *p; > int i; > - char sep; > + char sep[2]; > char **ap; > > switch (*name) { > @@ -912,15 +912,18 @@ varvalue(const char *name, int quoted, i > /* FALLTHROUGH */ > case '*': > if (ifsset()) > - sep = ifsval()[0]; > + sep[0] = ifsval()[0]; > else > - sep = ' '; > + sep[0] = ' '; > + sep[1] = '\0'; > for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { > strtodest(p, flag, subtype, quoted); > if (!*ap) > break; > - if (sep || (flag & EXP_FULL && !quoted && **ap != > '\0')) > - STPUTC(sep, expdest); > + if (sep[0]) > + strtodest(sep, flag, subtype, quoted); > + else if (flag & EXP_FULL && !quoted && **ap != > '\0') > + STPUTC('\0', expdest); > } > return; > default: > > Modified: head/bin/sh/tests/parameters/Makefile > > ============================================================================== > --- head/bin/sh/tests/parameters/Makefile Tue Oct 28 21:06:04 2014 > (r273801) > +++ head/bin/sh/tests/parameters/Makefile Tue Oct 28 22:14:31 2014 > (r273802) > @@ -18,6 +18,8 @@ FILES+= positional2.0 > FILES+= positional3.0 > FILES+= positional4.0 > FILES+= positional5.0 > +FILES+= positional6.0 > +FILES+= positional7.0 > FILES+= pwd1.0 > FILES+= pwd2.0 > > > Added: head/bin/sh/tests/parameters/positional6.0 > > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/bin/sh/tests/parameters/positional6.0 Tue Oct 28 22:14:31 2014 > (r273802) > @@ -0,0 +1,7 @@ > +# $FreeBSD$ > + > +IFS=? > +set p r > +v=pqrs > +r=${v#"$*"} > +[ "$r" = pqrs ] > > Added: head/bin/sh/tests/parameters/positional7.0 > > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/bin/sh/tests/parameters/positional7.0 Tue Oct 28 22:14:31 2014 > (r273802) > @@ -0,0 +1,8 @@ > +# $FreeBSD$ > + > +set -- / '' > +IFS=* > +set -- "$*" > +IFS=: > +args="$*" > +[ "$#:$args" = "1:/*" ] > >