Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When setting size of partitions interactively allow '-' for remainder of disk

This commit is contained in:
abs 1999-12-17 12:30:02 +00:00
parent 5ef6b59a7a
commit 669feec4e3
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sbin/disklabel/interact.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: interact.c,v 1.11 1999/11/26 06:03:10 mrg Exp $ */
/* $NetBSD: interact.c,v 1.12 1999/12/17 12:30:02 abs Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: interact.c,v 1.11 1999/11/26 06:03:10 mrg Exp $");
__RCSID("$NetBSD: interact.c,v 1.12 1999/12/17 12:30:02 abs Exp $");
#endif /* lint */
#include <sys/param.h>
@ -59,7 +59,7 @@ static void cmd_name __P((struct disklabel *, char *, int));
static int runcmd __P((char *, struct disklabel *, int));
static int getinput __P((const char *, const char *, const char *, char *));
static void defnum __P((char *, struct disklabel *, int));
static int getnum __P((char *, struct disklabel *));
static int getnum __P((char *, int, struct disklabel *));
static void deffstypename __P((char *, int));
static int getfstypename __P((const char *));
@ -436,7 +436,7 @@ cmd_part(lp, s, fd)
i = getinput(":", "Start offset", def, line);
if (i <= 0)
break;
if ((i = getnum(line, lp)) == -1) {
if ((i = getnum(line, 0, lp)) == -1) {
printf("Bad offset `%s'\n", line);
continue;
}
@ -445,10 +445,12 @@ cmd_part(lp, s, fd)
}
for (;;) {
defnum(def, lp, p->p_size);
i = getinput(":", "Partition size", def, line);
i = getinput(":", "Partition size ('-' for all remaining)",
def, line);
if (i <= 0)
break;
if ((i = getnum(line, lp)) == -1) {
if ((i = getnum(line, lp->d_secperunit - p->p_offset, lp))
== -1) {
printf("Bad size `%s'\n", line);
continue;
}
@ -567,19 +569,24 @@ defnum(buf, lp, size)
static int
getnum(buf, lp)
getnum(buf, max, lp)
char *buf;
int max;
struct disklabel *lp;
{
char *ep;
double d = strtod(buf, &ep);
double d;
int rv;
if (max && buf[0] == '-' && buf[1] == 0)
return max;
d = strtod(buf, &ep);
if (buf == ep)
return -1;
#define ROUND(a) ((a / lp->d_secpercyl) + \
((a % lp->d_secpercyl) ? 1 : 0)) * lp->d_secpercyl
((a % lp->d_secpercyl) ? 1 : 0)) * lp->d_secpercyl
switch (*ep) {
case '\0':