Module Name: src
Committed By: christos
Date: Tue Apr 1 19:08:48 UTC 2014
Modified Files:
src/sbin/fdisk: fdisk.c
Log Message:
default to something reasonable (like the interactive mode does) instead
of 0 when -1 is specified for the start or size.
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 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.147 src/sbin/fdisk/fdisk.c:1.148
--- src/sbin/fdisk/fdisk.c:1.147 Sun Mar 30 18:18:13 2014
+++ src/sbin/fdisk/fdisk.c Tue Apr 1 15:08:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fdisk.c,v 1.147 2014/03/30 22:18:13 christos Exp $ */
+/* $NetBSD: fdisk.c,v 1.148 2014/04/01 19:08:48 christos Exp $ */
/*
* Mach Operating System
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fdisk.c,v 1.147 2014/03/30 22:18:13 christos Exp $");
+__RCSID("$NetBSD: fdisk.c,v 1.148 2014/04/01 19:08:48 christos Exp $");
#endif /* not lint */
#define MBRPTYPENAMES
@@ -1817,7 +1817,7 @@ check_overlap(int part, int sysid, daddr
/* This is just a convention, not a requirement */
return "Track zero is reserved for the BIOS";
#endif
- if (start + size > disksectors)
+ if (start + size > disksectors)
return "Partition exceeds size of disk";
for (p = 0; p < MBR_PART_COUNT; p++) {
if (p == part || mboot.mbr_parts[p].mbrp_type == 0)
@@ -2036,10 +2036,16 @@ change_part(int extended, int part, int
} else {
if (sysid == -1)
sysid = partp->mbrp_type;
- if (start == (daddr_t)0xffffffff)
+ if (start == (daddr_t)0xffffffff) {
start = offset + le32toh(partp->mbrp_start);
- if (size == (daddr_t)0xffffffff)
+ if (start == 0)
+ start = offset = ptn_0_offset;
+ }
+ if (size == (daddr_t)0xffffffff) {
size = le32toh(partp->mbrp_size);
+ if (size == 0)
+ size = disksectors - start;
+ }
}
}
