From owner-svn-src-all@FreeBSD.ORG  Sun Jul 17 21:08:16 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CE801106566B;
	Sun, 17 Jul 2011 21:08:16 +0000 (UTC)
	(envelope-from rstone@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BBEE88FC13;
	Sun, 17 Jul 2011 21:08:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6HL8GwN090280;
	Sun, 17 Jul 2011 21:08:16 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6HL8Gkd090278;
	Sun, 17 Jul 2011 21:08:16 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201107172108.p6HL8Gkd090278@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Sun, 17 Jul 2011 21:08:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224150 - head/sbin/fdisk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jul 2011 21:08:16 -0000

Author: rstone
Date: Sun Jul 17 21:08:16 2011
New Revision: 224150
URL: http://svn.freebsd.org/changeset/base/224150

Log:
  The MBR uses a 32-bit unsigned integer to store the size of a slice, but
  fdisk(1) internally uses a signed int.  Should a user attempt to specify
  a slice containing more than 2^31 - 1 sectors, an error will be reported
  on systems with sizeof(long) == 4 and the slice size will be silently
  truncated on systems with sizeof(long) > 4.
  
  Instead use an unsigned long to store the slice size in fdisk(1).  This
  allows the user to specify a slice size up to the maximum permitted by
  the MBR on-disk format and does not have any problems with silent
  truncation should the use specify an slice size larger than 2^32 on systems
  with sizeof(long) > 4.
  
  Submitted by:	Mark Johnston (markjdb AT gmail DOT com)
  MFC after:	2 weeks

Modified:
  head/sbin/fdisk/fdisk.c

Modified: head/sbin/fdisk/fdisk.c
==============================================================================
--- head/sbin/fdisk/fdisk.c	Sun Jul 17 20:49:38 2011	(r224149)
+++ head/sbin/fdisk/fdisk.c	Sun Jul 17 21:08:16 2011	(r224150)
@@ -108,9 +108,9 @@ typedef struct cmd {
     char		cmd;
     int			n_args;
     struct arg {
-	char	argtype;
-	int	arg_val;
-	char	*arg_str;
+	char		argtype;
+	unsigned long	arg_val;
+	char *		arg_str;
     }			args[MAX_ARGS];
 } CMD;
 
@@ -990,7 +990,7 @@ parse_config_line(char *line, CMD *comma
 	    if (isalpha(*cp))
 		command->args[command->n_args].argtype = *cp++;
 	    end = NULL;
-	    command->args[command->n_args].arg_val = strtol(cp, &end, 0);
+	    command->args[command->n_args].arg_val = strtoul(cp, &end, 0);
  	    if (cp == end || (!isspace(*end) && *end != '\0')) {
  		char ch;
  		end = cp;