From owner-svn-src-head@freebsd.org  Sun Apr  2 14:02:11 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE994D2A429;
 Sun,  2 Apr 2017 14:02:11 +0000 (UTC)
 (envelope-from jilles@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 mx1.freebsd.org (Postfix) with ESMTPS id AEB5AFEE;
 Sun,  2 Apr 2017 14:02:11 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v32E2Af3019513;
 Sun, 2 Apr 2017 14:02:10 GMT (envelope-from jilles@FreeBSD.org)
Received: (from jilles@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v32E2A7m019512;
 Sun, 2 Apr 2017 14:02:10 GMT (envelope-from jilles@FreeBSD.org)
Message-Id: <201704021402.v32E2A7m019512@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jilles set sender to
 jilles@FreeBSD.org using -f
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 2 Apr 2017 14:02:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316418 - head/bin/sh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Apr 2017 14:02:12 -0000

Author: jilles
Date: Sun Apr  2 14:02:10 2017
New Revision: 316418
URL: https://svnweb.freebsd.org/changeset/base/316418

Log:
  sh: Remove global state from collate_range_cmp().
  
  The global state is not used across invocations of collate_range_cmp().

Modified:
  head/bin/sh/expand.c

Modified: head/bin/sh/expand.c
==============================================================================
--- head/bin/sh/expand.c	Sun Apr  2 13:43:45 2017	(r316417)
+++ head/bin/sh/expand.c	Sun Apr  2 14:02:10 2017	(r316418)
@@ -145,10 +145,12 @@ appendarglist(struct arglist *list, char
 static int
 collate_range_cmp(wchar_t c1, wchar_t c2)
 {
-	static wchar_t s1[2], s2[2];
+	wchar_t s1[2], s2[2];
 
 	s1[0] = c1;
+	s1[1] = L'\0';
 	s2[0] = c2;
+	s2[1] = L'\0';
 	return (wcscoll(s1, s2));
 }