From owner-freebsd-fs@FreeBSD.ORG  Mon Dec 15 23:48:11 2008
Return-Path: <owner-freebsd-fs@FreeBSD.ORG>
Delivered-To: freebsd-fs@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 41FC11065676
	for <freebsd-fs@freebsd.org>; Mon, 15 Dec 2008 23:48:11 +0000 (UTC)
	(envelope-from rick@kiwi-computer.com)
Received: from kiwi-computer.com (keira.kiwi-computer.com [63.224.10.3])
	by mx1.freebsd.org (Postfix) with SMTP id DE2BB8FC19
	for <freebsd-fs@freebsd.org>; Mon, 15 Dec 2008 23:48:10 +0000 (UTC)
	(envelope-from rick@kiwi-computer.com)
Received: (qmail 24565 invoked by uid 2001); 15 Dec 2008 23:48:09 -0000
Date: Mon, 15 Dec 2008 17:48:09 -0600
From: "Rick C. Petty" <rick-freebsd2008@kiwi-computer.com>
To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= <des@des.no>
Message-ID: <20081215234809.GA24403@keira.kiwi-computer.com>
References: <20081213173902.GA96883@keira.kiwi-computer.com>
	<20081213183058.GA20992@a91-153-125-115.elisa-laajakaista.fi>
	<20081213192320.GA97766@keira.kiwi-computer.com>
	<86y6yh5pz0.fsf@ds4.des.no>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <86y6yh5pz0.fsf@ds4.des.no>
User-Agent: Mutt/1.4.2.3i
Cc: freebsd-fs@freebsd.org
Subject: Re: UFS label limitations
X-BeenThere: freebsd-fs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: rick-freebsd2008@kiwi-computer.com
List-Id: Filesystems <freebsd-fs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-fs>
List-Post: <mailto:freebsd-fs@freebsd.org>
List-Help: <mailto:freebsd-fs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Dec 2008 23:48:11 -0000

On Mon, Dec 15, 2008 at 06:05:07PM +0100, Dag-Erling Smørgrav wrote:
> "Rick C. Petty" <rick-freebsd2008@kiwi-computer.com> writes:
> > Well at the very least can we allow all characters between 0x20 and 0x7e
> > except for:  "&/<>\
> 
> Stick to the POSIX portable file name character set: [A-Za-z0-9._-]

Good idea.  It gives me the separators I need.  Would a committer be
willing to review and commit the attached (inline) patch?

-- Rick C. Petty


--- src/sbin/newfs/newfs.c.orig	2007-03-02 14:07:59.000000000 -0600
+++ src/sbin/newfs/newfs.c	2008-12-15 17:29:26.000000000 -0600
@@ -168,11 +168,15 @@
 		case 'L':
 			volumelabel = optarg;
 			i = -1;
-			while (isalnum(volumelabel[++i]));
-			if (volumelabel[i] != '\0') {
-				errx(1, "bad volume label. Valid characters are alphanumerics.");
-			}
-			if (strlen(volumelabel) >= MAXVOLLEN) {
+			while ((ch = volumelabel[++i]) != '\0')
+				if (ch != '-' && ch != '.' && ch != '_' &&
+				    (ch < '0' || ch > '9') &&
+				    (ch < 'A' || ch > 'Z') &&
+				    (ch < 'a' || ch > 'z'))
+					errx(1,
+					"bad volume label. Valid characters are "
+					"[0-9A-Za-z._-].");
+			if (i >= MAXVOLLEN) {
 				errx(1, "bad volume label. Length is longer than %d.",
 				    MAXVOLLEN);
 			}
--- src/sbin/tunefs/tunefs.c.orig	2008-02-26 14:25:35.000000000 -0600
+++ src/sbin/tunefs/tunefs.c	2008-12-15 17:27:58.000000000 -0600
@@ -153,13 +153,16 @@
 			name = "volume label";
 			Lvalue = optarg;
 			i = -1;
-			while (isalnum(Lvalue[++i]));
-			if (Lvalue[i] != '\0') {
+			while ((ch = Lvalue[++i]) != '\0')
+				if (ch != '-' && ch != '.' && ch != '_' &&
+				    (ch < '0' || ch > '9') &&
+				    (ch < 'A' || ch > 'Z') &&
+				    (ch < 'a' || ch > 'z'))
 				errx(10,
-				"bad %s. Valid characters are alphanumerics.",
+					"bad %s. Valid characters are "
+					"[0-9A-Za-z._-].",
 				    name);
-			}
-			if (strlen(Lvalue) >= MAXVOLLEN) {
+			if (i >= MAXVOLLEN) {
 				errx(10, "bad %s. Length is longer than %d.",
 				    name, MAXVOLLEN - 1);
 			}