From owner-svn-src-stable@freebsd.org  Mon Jun 26 17:29:33 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 B92C8D8CAC2;
 Mon, 26 Jun 2017 17:29:33 +0000 (UTC)
 (envelope-from mckusick@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 78F35811D8;
 Mon, 26 Jun 2017 17:29:33 +0000 (UTC)
 (envelope-from mckusick@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5QHTWmS017699;
 Mon, 26 Jun 2017 17:29:32 GMT (envelope-from mckusick@FreeBSD.org)
Received: (from mckusick@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5QHTWME017698;
 Mon, 26 Jun 2017 17:29:32 GMT (envelope-from mckusick@FreeBSD.org)
Message-Id: <201706261729.v5QHTWME017698@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mckusick set sender to
 mckusick@FreeBSD.org using -f
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Mon, 26 Jun 2017 17:29:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r320365 - stable/11/sbin/newfs
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2017 17:29:33 -0000

Author: mckusick
Date: Mon Jun 26 17:29:32 2017
New Revision: 320365
URL: https://svnweb.freebsd.org/changeset/base/320365

Log:
  MFC of 320176:
  
  Allow '_' in labels when specifying -L to newfs.
  
  PR: 220163
  Reported by: Keve Nagy
  Reviewed by: kib
  Approved by: re@ (Xin Li)

Modified:
  stable/11/sbin/newfs/newfs.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/newfs/newfs.c
==============================================================================
--- stable/11/sbin/newfs/newfs.c	Mon Jun 26 16:28:46 2017	(r320364)
+++ stable/11/sbin/newfs/newfs.c	Mon Jun 26 17:29:32 2017	(r320365)
@@ -150,7 +150,8 @@ main(int argc, char *argv[])
 		case 'L':
 			volumelabel = optarg;
 			i = -1;
-			while (isalnum(volumelabel[++i]));
+			while (isalnum(volumelabel[++i]) ||
+			    volumelabel[i] == '_');
 			if (volumelabel[i] != '\0') {
 				errx(1, "bad volume label. Valid characters are alphanumerics.");
 			}