Module Name: src
Committed By: sborrill
Date: Mon Apr 20 15:03:56 UTC 2009
Modified Files:
src/sbin/fdisk: fdisk.c
Log Message:
When using -s flag, read start and size as unsigned to allow for larger
disks. (Thanks to drochner@ for catching it).
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sbin/fdisk/fdisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fdisk/fdisk.c
diff -u src/sbin/fdisk/fdisk.c:1.118 src/sbin/fdisk/fdisk.c:1.119
--- src/sbin/fdisk/fdisk.c:1.118 Mon Apr 6 12:18:19 2009
+++ src/sbin/fdisk/fdisk.c Mon Apr 20 15:03:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fdisk.c,v 1.118 2009/04/06 12:18:19 lukem Exp $ */
+/* $NetBSD: fdisk.c,v 1.119 2009/04/20 15:03:56 sborrill Exp $ */
/*
* Mach Operating System
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fdisk.c,v 1.118 2009/04/06 12:18:19 lukem Exp $");
+__RCSID("$NetBSD: fdisk.c,v 1.119 2009/04/20 15:03:56 sborrill Exp $");
#endif /* not lint */
#define MBRPTYPENAMES
@@ -286,8 +286,8 @@
char *cbootmenu = 0;
#endif
- int csysid, cstart, csize; /* For the b_flag. */
-
+ int csysid; /* For the b_flag. */
+ unsigned int cstart, csize;
a_flag = i_flag = u_flag = sh_flag = f_flag = s_flag = b_flag = 0;
v_flag = 0;
E_flag = 0;
@@ -345,7 +345,7 @@
break;
case 's': /* Partition details */
s_flag = 1;
- if (sscanf(optarg, "%d/%d/%d%n", &csysid, &cstart,
+ if (sscanf(optarg, "%d/%u/%u%n", &csysid, &cstart,
&csize, &n) == 3) {
if (optarg[n] == 0)
break;
