Add a str2bytes() function which converts byte size strings to

number of bytes.

In difference from for instance FreeBSD's relatively newly added
expand_number(), this function also takes floatingpoint specifications
like "1.5T".

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2331 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/include/libvarnish.h b/varnish-cache/include/libvarnish.h
index a01ca8808cb0dfd45fd3fbf5b2cb2025acff89f2..e94176e56bd986a47fbda3d5d8413f2f6f8ae492 100644 (file)
--- a/varnish-cache/include/libvarnish.h
+++ b/varnish-cache/include/libvarnish.h
@@ -45,6 +45,9 @@ char **ParseArgv(const char *s, int comment);
 uint32_t crc32(uint32_t crc, const void *p1, unsigned l);
 uint32_t crc32_l(const void *p1, unsigned l);
 
+/* from libvarnish/num.c */
+const char *str2bytes(const char *p, uintmax_t *r);
+
 /* from libvarnish/time.c */
 void TIM_format(double t, char *p);
 time_t TIM_parse(const char *p);

diff --git a/varnish-cache/lib/libvarnish/Makefile.am b/varnish-cache/lib/libvarnish/Makefile.am
index 7caf48c79905bef91db167ced8826bcc4828185f..47c8e4dde486ee9966130cdff774ac3fdbac55f0 100644 (file)
--- a/varnish-cache/lib/libvarnish/Makefile.am
+++ b/varnish-cache/lib/libvarnish/Makefile.am
@@ -12,6 +12,7 @@ libvarnish_la_SOURCES = \
        cli_common.c \
        crc32.c \
        flopen.c \
+       num.c \
        time.c \
        version.c \
        vpf.c \

diff --git a/varnish-cache/lib/libvarnish/num.c b/varnish-cache/lib/libvarnish/num.c
new file mode 100644 (file)
index 0000000..686a430
--- /dev/null
+++ b/varnish-cache/lib/libvarnish/num.c
@@ -0,0 +1,72 @@
+/*-
+ * Copyright (c) 2008 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk@phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ *
+ * Deal with numbers with data storage suffix scaling
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#include <libvarnish.h>
+
+const char *
+str2bytes(const char *p, uintmax_t *r)
+{
+       int i;
+       double l;
+       char suff[2];
+
+       i = sscanf(p, "%lg%1s", &l, suff);
+
+       assert(i >= -1 && i <= 2);
+
+       if (i < 1)
+               return ("Could not find any number");
+
+       if (l < 0.0)
+               return ("Negative numbers not allowed");
+
+       if (i == 2) {
+               switch (tolower(*suff)) {
+               case 'b': break;
+               case 'k': l *= ((uintmax_t)1 << 10); break;
+               case 'm': l *= ((uintmax_t)1 << 20); break;
+               case 'g': l *= ((uintmax_t)1 << 30); break;
+               case 't': l *= ((uintmax_t)1 << 40); break;
+               case 'p': l *= ((uintmax_t)1 << 50); break;
+               case 'e': l *= ((uintmax_t)1 << 60); break;
+               default:
+                       return ("Unknown scaling suffix [bkmgtpe] allowed");
+               }
+       }
+       *r = (uintmax_t)(l + .5);
+       return (NULL);
+}
+