From owner-svn-ports-all@freebsd.org Fri Jun 1 16:20:24 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED133F78D51; Fri, 1 Jun 2018 16:20:23 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A014C84451; Fri, 1 Jun 2018 16:20:23 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A3ED2B129; Fri, 1 Jun 2018 16:20:23 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w51GKNof002723; Fri, 1 Jun 2018 16:20:23 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w51GKMNW002720; Fri, 1 Jun 2018 16:20:22 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201806011620.w51GKMNW002720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 1 Jun 2018 16:20:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471264 - head/Mk/Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/Mk/Scripts X-SVN-Commit-Revision: 471264 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jun 2018 16:20:24 -0000 Author: mat Date: Fri Jun 1 16:20:22 2018 New Revision: 471264 URL: https://svnweb.freebsd.org/changeset/ports/471264 Log: SC2145: Argument mixes string and array. Use * or separate argument. The behavior when concatenating a string and array is rarely intended. The preceeding string is prefixed to the first array element, while the succeeding string is appended to the last one. The middle array elements are unaffected. For example, with the parameters foo,bar,baz, "--flag=$@" is equivalent to the three arguments "--flag=foo" "bar" "baz". PR: 227109 Submitted by: mat Sponsored by: Absolight Modified: head/Mk/Scripts/functions.sh (contents, props changed) head/Mk/Scripts/generate-symbols.sh (contents, props changed) head/Mk/Scripts/qa.sh (contents, props changed) Modified: head/Mk/Scripts/functions.sh ============================================================================== --- head/Mk/Scripts/functions.sh Fri Jun 1 15:30:57 2018 (r471263) +++ head/Mk/Scripts/functions.sh Fri Jun 1 16:20:22 2018 (r471264) @@ -74,9 +74,9 @@ parse_plist() { @info\ *|@shell\ *|@xmlcatmgr\ *) set -- $line shift - case "$@" in - /*) echo "${comment}$@" ;; - *) echo "${comment}${cwd}/$@" ;; + case "$*" in + /*) echo "${comment}$*" ;; + *) echo "${comment}${cwd}/$*" ;; esac ;; @sample\ *) @@ -103,12 +103,12 @@ parse_plist() { @fc\ *|@fcfontsdir\ *|@fontsdir\ *) set -- $line shift - case "$@" in + case "$*" in /*) - echo >&3 "${comment}$@" + echo >&3 "${comment}$*" ;; *) - echo >&3 "${comment}${cwd}/$@" + echo >&3 "${comment}${cwd}/$*" ;; esac ;; Modified: head/Mk/Scripts/generate-symbols.sh ============================================================================== --- head/Mk/Scripts/generate-symbols.sh Fri Jun 1 15:30:57 2018 (r471263) +++ head/Mk/Scripts/generate-symbols.sh Fri Jun 1 16:20:22 2018 (r471264) @@ -3,7 +3,7 @@ # Maintainer: portmgr@FreeBSD.org msg() { - echo "====> $@" + echo "====> $*" } msg "Finding symbols" Modified: head/Mk/Scripts/qa.sh ============================================================================== --- head/Mk/Scripts/qa.sh Fri Jun 1 15:30:57 2018 (r471263) +++ head/Mk/Scripts/qa.sh Fri Jun 1 16:20:22 2018 (r471264) @@ -13,15 +13,15 @@ LF=$(printf '\nX') LF=${LF%X} notice() { - echo "Notice: $@" >&2 + echo "Notice: $*" >&2 } warn() { - echo "Warning: $@" >&2 + echo "Warning: $*" >&2 } err() { - echo "Error: $@" >&2 + echo "Error: $*" >&2 } list_stagedir_elfs() { @@ -31,7 +31,7 @@ list_stagedir_elfs() { shebangonefile() { local f interp interparg badinterp rc - f="$@" + f="$*" rc=0 # whitelist some files