Author: trociny
Date: Sun Mar 13 19:23:32 2011
New Revision: 219620
URL: http://svn.freebsd.org/changeset/base/219620
Log:
In command line options allow size to be specified using k/M/G/T
suffixes.
Approved by: pjd (mentor)
MFC after: 1 week
Modified:
head/sbin/hastctl/hastctl.8
head/sbin/hastctl/hastctl.c
Modified: head/sbin/hastctl/hastctl.8
==============================================================================
--- head/sbin/hastctl/hastctl.8 Sun Mar 13 19:07:58 2011 (r219619)
+++ head/sbin/hastctl/hastctl.8 Sun Mar 13 19:23:32 2011 (r219620)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 1, 2010
+.Dd March 13, 2011
.Dt HASTCTL 8
.Os
.Sh NAME
@@ -113,6 +113,9 @@ Size of the smaller provider used as bac
This option can be omitted if node providers have the same size on both
sides.
.El
+.Pp
+If size is suffixed with a k, M, G or T, it is taken as a kilobyte,
+megabyte, gigabyte or terabyte measurement respectively.
.It Cm role
Change role of the given resource.
The role can be one of:
Modified: head/sbin/hastctl/hastctl.c
==============================================================================
--- head/sbin/hastctl/hastctl.c Sun Mar 13 19:07:58 2011 (r219619)
+++ head/sbin/hastctl/hastctl.c Sun Mar 13 19:23:32 2011 (r219620)
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
#include <err.h>
#include <errno.h>
#include <fcntl.h>
-#include <inttypes.h>
+#include <libutil.h>
#include <limits.h>
#include <signal.h>
#include <stdio.h>
@@ -342,30 +342,11 @@ control_status(struct nv *nv)
return (ret);
}
-static int
-numfromstr(const char *str, intmax_t *nump)
-{
- intmax_t num;
- char *suffix;
- int rerrno;
-
- rerrno = errno;
- errno = 0;
- num = strtoimax(str, &suffix, 0);
- if (errno == 0 && *suffix != '\0')
- errno = EINVAL;
- if (errno != 0)
- return (-1);
- *nump = num;
- errno = rerrno;
- return (0);
-}
-
int
main(int argc, char *argv[])
{
struct nv *nv;
- intmax_t mediasize, extentsize, keepdirty;
+ int64_t mediasize, extentsize, keepdirty;
int cmd, debug, error, ii;
const char *optstr;
@@ -407,15 +388,15 @@ main(int argc, char *argv[])
debug++;
break;
case 'e':
- if (numfromstr(optarg, &extentsize) < 0)
+ if (expand_number(optarg, &extentsize) < 0)
err(1, "Invalid extentsize");
break;
case 'k':
- if (numfromstr(optarg, &keepdirty) < 0)
+ if (expand_number(optarg, &keepdirty) < 0)
err(1, "Invalid keepdirty");
break;
case 'm':
- if (numfromstr(optarg, &mediasize) < 0)
+ if (expand_number(optarg, &mediasize) < 0)
err(1, "Invalid mediasize");
break;
case 'h':
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
