Module Name: src
Committed By: snj
Date: Mon Apr 20 23:16:45 UTC 2009
Modified Files:
src/sbin/fdisk [netbsd-5]: fdisk.c
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #712):
sbin/fdisk/fdisk.c: revision 1.119
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.116 -r1.116.6.1 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.116 src/sbin/fdisk/fdisk.c:1.116.6.1
--- src/sbin/fdisk/fdisk.c:1.116 Sun Mar 9 14:57:10 2008
+++ src/sbin/fdisk/fdisk.c Mon Apr 20 23:16:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fdisk.c,v 1.116 2008/03/09 14:57:10 tnn Exp $ */
+/* $NetBSD: fdisk.c,v 1.116.6.1 2009/04/20 23:16:45 snj Exp $ */
/*
* Mach Operating System
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fdisk.c,v 1.116 2008/03/09 14:57:10 tnn Exp $");
+__RCSID("$NetBSD: fdisk.c,v 1.116.6.1 2009/04/20 23:16:45 snj Exp $");
#endif /* not lint */
#define MBRPTYPENAMES
@@ -296,8 +296,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;
@@ -355,7 +355,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;
