From owner-svn-src-user@FreeBSD.ORG  Tue Jan 11 05:22:32 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 385EF106564A;
	Tue, 11 Jan 2011 05:22:32 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 277248FC17;
	Tue, 11 Jan 2011 05:22:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0B5MWBZ007558;
	Tue, 11 Jan 2011 05:22:32 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0B5MWEL007554;
	Tue, 11 Jan 2011 05:22:32 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101110522.p0B5MWEL007554@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 11 Jan 2011 05:22:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217257 - user/nwhitehorn/bsdinstall/partedit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Jan 2011 05:22:32 -0000

Author: nwhitehorn
Date: Tue Jan 11 05:22:31 2011
New Revision: 217257
URL: http://svn.freebsd.org/changeset/base/217257

Log:
  More anti-foot-shooting measures: gpart labels do not like to contain
  slashes, so provide a more helpful error message if the user tries
  to set one with a slash in it.
  
  Submitted by:	joel

Modified:
  user/nwhitehorn/bsdinstall/partedit/gpart_ops.c

Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c
==============================================================================
--- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c	Tue Jan 11 04:25:54 2011	(r217256)
+++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c	Tue Jan 11 05:22:31 2011	(r217257)
@@ -400,6 +400,13 @@ editpart:
 	if (choice) /* Cancel pressed */
 		return;
 
+	/* Check if the label has a / in it */
+	if (strchr(items[3].text, '/') != NULL) {
+		dialog_msgbox("Error", "Label contains a /, which is not an "
+		    "allowed character.", 0, 0, TRUE);
+		goto editpart;
+	}
+
 	if (strncmp(items[0].text, "freebsd-", 8) != 0 &&
 	    items[0].text[0] != '\0') {
 		char message[512];
@@ -648,6 +655,13 @@ addpartform:
 		size = MIN((intmax_t)(bytes/sector), maxsize);
 	}
 
+	/* Check if the label has a / in it */
+	if (strchr(items[3].text, '/') != NULL) {
+		dialog_msgbox("Error", "Label contains a /, which is not an "
+		    "allowed character.", 0, 0, TRUE);
+		goto addpartform;
+	}
+
 	/* Warn if no mountpoint set */
 	if (strcmp(items[0].text, "freebsd-ufs") == 0 &&
 	    items[2].text[0] != '/') {