summaryrefslogtreecommitdiff
path: root/sbin/disklabel
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-12-29 19:51:35 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-12-29 19:51:35 +0000
commit967a2a387aa0f52c9ef919f1f3dc3bb867b112b2 (patch)
tree1ef68178573cb6b6e1be2c977630664d91807b7f /sbin/disklabel
parent26e9440004b12706f66601736a79ffbc73cae7c1 (diff)
Add support for % and & units to indicate percent of total space and
percent of available space respectively. From Sebastian Horzela.
Diffstat (limited to 'sbin/disklabel')
-rw-r--r--sbin/disklabel/disklabel.87
-rw-r--r--sbin/disklabel/editor.c23
2 files changed, 24 insertions, 6 deletions
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 505bc1c2b51..ffdae0fe8d5 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: disklabel.8,v 1.55 2003/12/20 09:29:27 jmc Exp $
+.\" $OpenBSD: disklabel.8,v 1.56 2003/12/29 19:51:34 millert Exp $
.\" $NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
.\"
.\" Copyright (c) 1987, 1988, 1991, 1993
@@ -168,6 +168,11 @@ Print partition sizes and offsets in
.Ar unit
instead of sectors.
Valid units are b(ytes), c(ylinders), k(ilobytes), m(egabytes) and g(igabytes).
+For operations other than displaying a partition the
+.Ql %
+(percent of total) and
+.Ql &
+(percent of free) units are also accepted.
.It Fl R
Restore a disk label that was formatted in a prior operation and
saved in an
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index 7eeb9845171..b276cb30034 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: editor.c,v 1.92 2003/12/20 09:29:27 jmc Exp $ */
+/* $OpenBSD: editor.c,v 1.93 2003/12/29 19:51:34 millert Exp $ */
/*
* Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -17,7 +17,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: editor.c,v 1.92 2003/12/20 09:29:27 jmc Exp $";
+static char rcsid[] = "$OpenBSD: editor.c,v 1.93 2003/12/29 19:51:34 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -1035,7 +1035,7 @@ getuint(struct disklabel *lp, int partno, char *prompt, char *helpstring,
u_int32_t rval = oval;
size_t n;
int mult = 1;
- double d;
+ double d, percent = 1.0;
/* We only care about the remainder */
offset = offset % lp->d_secpercyl;
@@ -1086,6 +1086,18 @@ getuint(struct disklabel *lp, int partno, char *prompt, char *helpstring,
mult = 1073741824 / lp->d_secsize;
buf[--n] = '\0';
break;
+ case '%':
+ buf[--n] = '\0';
+ percent = strtod(buf, NULL) / 100.0;
+ snprintf(buf, sizeof(buf), "%d",
+ lp->d_secperunit);
+ break;
+ case '&':
+ buf[--n] = '\0';
+ percent = strtod(buf, NULL) / 100.0;
+ snprintf(buf, sizeof(buf), "%d",
+ maxval);
+ break;
}
}
@@ -1105,10 +1117,10 @@ getuint(struct disklabel *lp, int partno, char *prompt, char *helpstring,
} else {
/* XXX - should check for overflow */
if (mult > 0)
- rval = d * mult;
+ rval = d * mult * percent;
else
/* Negative mult means divide (fancy) */
- rval = d / (-mult);
+ rval = d / (-mult) * percent;
/* Apply the operator */
if (operator == '+')
@@ -1877,6 +1889,7 @@ editor_help(char *arg)
"Numeric parameters may use suffixes to indicate units:\n\t"
"'b' for bytes, 'c' for cylinders, 'k' for kilobytes, 'm' for megabytes,\n\t"
"'g' for gigabytes or no suffix for sectors (usually 512 bytes).\n\t"
+"'%' for percent of total disk size, '&' for percent of free space.\n\t"
"Non-sector units will be rounded to the nearest cylinder.\n"
"Entering '?' at most prompts will give you (simple) context sensitive help.");
break;