crypto/hkdf_sha256: new module.

[ccan] / ccan / opt / helpers.c

diff --git a/ccan/opt/helpers.c b/ccan/opt/helpers.c
index 17d56e0201dc66d7810b26f1cd40a1e5e702f0a7..118e543602e06b981e6faee7dd5f416cf819d5cd 100644 (file)
--- a/ccan/opt/helpers.c
+++ b/ccan/opt/helpers.c
@@ -1,19 +1,22 @@
-/* Licensed under GPLv3+ - see LICENSE file for details */
+/* Licensed under GPLv2+ - see LICENSE file for details */
 #include <ccan/opt/opt.h>
+#include <ccan/cast/cast.h>
+#include <inttypes.h>
 #include <string.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
 #include <limits.h>
 #include "private.h"
+#include <float.h>
 
 /* Upper bound to sprintf this simple type?  Each 3 bits < 1 digit. */
 #define CHAR_SIZE(type) (((sizeof(type)*CHAR_BIT + 2) / 3) + 1)
 
-/* FIXME: asprintf module? */
 static char *arg_bad(const char *fmt, const char *arg)
 {
-       char *str = malloc(strlen(fmt) + strlen(arg));
+       char *str = opt_alloc.alloc(strlen(fmt) + strlen(arg));
        sprintf(str, fmt, arg);
        return str;
 }
@@ -52,7 +55,7 @@ char *opt_set_invbool_arg(const char *arg, bool *b)
 /* Set a char *. */
 char *opt_set_charp(const char *arg, char **p)
 {
-       *p = (char *)arg;
+       *p = cast_const(char *, arg);
        return NULL;
 }
 
@@ -113,12 +116,67 @@ char *opt_set_ulongval(const char *arg, unsigned long *ul)
        return NULL;
 }
 
+char *opt_set_floatval(const char *arg, float *f)
+{
+       double d;
+       char *err;
+
+       err = opt_set_doubleval(arg, &d);
+       if (err)
+               return err;
+
+       *f = d;
+
+       /*allow true infinity via --foo=INF, while avoiding isinf() from math.h
+         because it wasn't standard 25 years ago.*/
+       double inf = 1e300 * 1e300; /*direct 1e600 annoys -Woverflow*/
+       if ((d > FLT_MAX || d < -FLT_MAX) && d != inf && d != -inf)
+               return arg_bad("'%s' is out of range for a 32 bit float", arg);
+       if (d != 0 && *f == 0)
+               return arg_bad("'%s' is out of range (truncated to zero)", arg);
+
+       return NULL;
+}
+
+void opt_show_floatval(char buf[OPT_SHOW_LEN], const float *f)
+{
+       double d = *f;
+       opt_show_doubleval(buf, &d);
+}
+
+char *opt_set_doubleval(const char *arg, double *d)
+{
+       char *endp;
+
+       /* This is how the manpage says to do it.  Yech. */
+       errno = 0;
+       /* Don't assume strtof */
+       *d = strtod(arg, &endp);
+       if (*endp || !arg[0])
+               return arg_bad("'%s' is not a number", arg);
+       if (errno)
+               return arg_bad("'%s' is out of range", arg);
+
+       return NULL;
+}
+
+void opt_show_doubleval(char buf[OPT_SHOW_LEN], const double *d)
+{
+       snprintf(buf, OPT_SHOW_LEN, "%f", *d);
+}
+
 char *opt_inc_intval(int *i)
 {
        (*i)++;
        return NULL;
 }
 
+char *opt_dec_intval(int *i)
+{
+       (*i)--;
+       return NULL;
+}
+
 /* Display version string. */
 char *opt_version_and_exit(const char *version)
 {
@@ -133,7 +191,7 @@ char *opt_usage_and_exit(const char *extra)
        char *usage = opt_usage(opt_argv0, extra);
        printf("%s", usage);
        /* Don't have valgrind complain! */
-       free(usage);
+       opt_alloc.free(usage);
        opt_free_table();
        exit(0);
 }
@@ -150,14 +208,19 @@ void opt_show_invbool(char buf[OPT_SHOW_LEN], const bool *b)
 
 void opt_show_charp(char buf[OPT_SHOW_LEN], char *const *p)
 {
-       size_t len = strlen(*p);
-       buf[0] = '"';
-       if (len > OPT_SHOW_LEN - 2)
-               len = OPT_SHOW_LEN - 2;
-       strncpy(buf+1, *p, len);
-       buf[1+len] = '"';
-       if (len < OPT_SHOW_LEN - 2)
-               buf[2+len] = '\0';
+       if (*p){
+               size_t len = strlen(*p);
+               buf[0] = '"';
+               if (len > OPT_SHOW_LEN - 2)
+                       len = OPT_SHOW_LEN - 2;
+               strncpy(buf+1, *p, len);
+               buf[1+len] = '"';
+               if (len < OPT_SHOW_LEN - 2)
+                       buf[2+len] = '\0';
+       }
+       else {
+               strncpy(buf, "(nil)", OPT_SHOW_LEN);
+       }
 }
 
 /* Show an integer value, various forms. */
@@ -192,9 +255,10 @@ static char *set_llong_with_suffix(const char *arg, long long *ll,
                                   const long long base)
 {
        char *endp;
-       if (!arg[0])
+       if (!arg[0]){
+               *ll = 0;
                return arg_bad("'%s' (an empty string) is not a number", arg);
-
+       }
        errno = 0;
        *ll = strtoll(arg, &endp, 0);
        if (errno)
@@ -400,9 +464,9 @@ static void show_llong_with_suffix(char buf[OPT_SHOW_LEN], long long ll,
                ll = tmp;
        }
        if (i == 0)
-               snprintf(buf, OPT_SHOW_LEN, "%lld", ll);
+               snprintf(buf, OPT_SHOW_LEN, "%"PRId64, (int64_t)ll);
        else
-               snprintf(buf, OPT_SHOW_LEN, "%lld%c", ll, suffixes[i - 1]);
+               snprintf(buf, OPT_SHOW_LEN, "%"PRId64"%c", (int64_t)ll, suffixes[i - 1]);
 }
 
 static void show_ullong_with_suffix(char buf[OPT_SHOW_LEN], unsigned long long ull,
@@ -422,9 +486,9 @@ static void show_ullong_with_suffix(char buf[OPT_SHOW_LEN], unsigned long long u
                ull = tmp;
        }
        if (i == 0)
-               snprintf(buf, OPT_SHOW_LEN, "%llu", ull);
+               snprintf(buf, OPT_SHOW_LEN, "%"PRIu64, (uint64_t)ull);
        else
-               snprintf(buf, OPT_SHOW_LEN, "%llu%c", ull, suffixes[i - 1]);
+               snprintf(buf, OPT_SHOW_LEN, "%"PRIu64"%c", (uint64_t)ull, suffixes[i - 1]);
 }
 
 /* _bi, signed */