From: Karel Zak <kzak@redhat.com>
Date: Thu, 13 Nov 2008 14:37:22 +0000 (+0100)
Subject: fdisk: read /proc/partitions in more robust way
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=981b80b797bbd8076ae280d7dd2e3dfda3ad76ec;p=util-linux

fdisk: read /proc/partitions in more robust way

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index ff7ac672..84e1860f 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -2049,7 +2049,7 @@ add_partition(int n, int sys) {
 	do {
 		temp = start;
 		for (i = 0; i < partitions; i++) {
-			unsigned int lastplusoff;
+			unsigned long long lastplusoff;
 
 			if (start == ptes[i].offset)
 				start += sector_offset;
@@ -2065,7 +2065,7 @@ add_partition(int n, int sys) {
 			read = 0;
 		}
 		if (!read && start == temp) {
-			unsigned int i = start;
+			unsigned long long i = start;
 
 			start = read_int(cround(i), cround(i), cround(limit),
 					 0, mesg);
@@ -2551,7 +2551,8 @@ static void
 tryprocpt(void) {
 	FILE *procpt;
 	char line[100], ptname[100], devname[120];
-	int ma, mi, sz;
+	int ma, mi;
+	unsigned long long sz;
 
 	procpt = fopen(PROC_PARTITIONS, "r");
 	if (procpt == NULL) {
@@ -2560,7 +2561,7 @@ tryprocpt(void) {
 	}
 
 	while (fgets(line, sizeof(line), procpt)) {
-		if (sscanf (line, " %d %d %d %[^\n ]",
+		if (sscanf (line, " %d %d %llu %100[^\n ]",
 			    &ma, &mi, &sz, ptname) != 4)
 			continue;
 		snprintf(devname, sizeof(devname), "/dev/%s", ptname);