From e67e29d91a1ef90af545e4130c7b4c4cfde6202a Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Mon, 1 Jun 2020 17:31:51 +0200

Subject: [PATCH] parse-util: also parse integers prefixed with 0b and 0o

Let's adopt Python 3 style 0b and 0x syntaxes, because it makes a ton of

sense, in particular in bitmask settings.

(cherry picked from commit fc80cabcf584a8b486bdff5be0c074fec4059cdc)

Related: #1848373

---

 src/basic/parse-util.c | 56 ++++++++++++++++++++++++++++++++++++++----

 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c

index 68c156c543..992ea3605b 100644

--- a/src/basic/parse-util.c

+++ b/src/basic/parse-util.c

@@ -17,6 +17,7 @@

 #include "parse-util.h"

 #include "process-util.h"

 #include "string-util.h"

+#include "strv.h"

 int parse_boolean(const char *v) {

         assert(v);

@@ -373,7 +374,32 @@ char *format_bytes(char *buf, size_t l, uint64_t t) {

 finish:

         buf[l-1] = 0;

         return buf;

+}

+

+static const char *mangle_base(const char *s, unsigned *base) {

+        const char *k;

+

+        assert(s);

+        assert(base);

+

+        /* Base already explicitly specified, then don't do anything. */

+        if (SAFE_ATO_MASK_FLAGS(*base) != 0)

+                return s;

+        /* Support Python 3 style "0b" and 0x" prefixes, because they truly make sense, much more than C's "0" prefix for octal. */

+        k = STARTSWITH_SET(s, "0b", "0B");

+        if (k) {

+                *base = 2 | (*base & SAFE_ATO_ALL_FLAGS);

+                return k;

+        }

+

+        k = STARTSWITH_SET(s, "0o", "0O");

+        if (k) {

+                *base = 8 | (*base & SAFE_ATO_ALL_FLAGS);

+                return k;

+        }

+

+        return s;

 }

 int safe_atou_full(const char *s, unsigned base, unsigned *ret_u) {

@@ -407,6 +433,8 @@ int safe_atou_full(const char *s, unsigned base, unsigned *ret_u) {

                 return -EINVAL; /* This is particularly useful to avoid ambiguities between C's octal

                                  * notation and assumed-to-be-decimal integers with a leading zero. */

+        s = mangle_base(s, &base);

+

         errno = 0;

         l = strtoul(s, &x, SAFE_ATO_MASK_FLAGS(base) /* Let's mask off the flags bits so that only the actual

                                                       * base is left */);

@@ -426,13 +454,17 @@ int safe_atou_full(const char *s, unsigned base, unsigned *ret_u) {

 }

 int safe_atoi(const char *s, int *ret_i) {

+        unsigned base = 0;

         char *x = NULL;

         long l;

         assert(s);

+        s += strspn(s, WHITESPACE);

+        s = mangle_base(s, &base);

+

         errno = 0;

-        l = strtol(s, &x, 0);

+        l = strtol(s, &x, base);

         if (errno > 0)

                 return -errno;

         if (!x || x == s || *x != 0)

@@ -467,6 +499,8 @@ int safe_atollu_full(const char *s, unsigned base, long long unsigned *ret_llu)

             s[0] == '0' && s[1] != 0)

                 return -EINVAL;

+        s = mangle_base(s, &base);

+

         errno = 0;

         l = strtoull(s, &x, SAFE_ATO_MASK_FLAGS(base));

         if (errno > 0)

@@ -483,13 +517,17 @@ int safe_atollu_full(const char *s, unsigned base, long long unsigned *ret_llu)

 }

 int safe_atolli(const char *s, long long int *ret_lli) {

+        unsigned base = 0;

         char *x = NULL;

         long long l;

         assert(s);

+        s += strspn(s, WHITESPACE);

+        s = mangle_base(s, &base);

+

         errno = 0;

-        l = strtoll(s, &x, 0);

+        l = strtoll(s, &x, base);

         if (errno > 0)

                 return -errno;

         if (!x || x == s || *x != 0)

@@ -502,15 +540,17 @@ int safe_atolli(const char *s, long long int *ret_lli) {

 }

 int safe_atou8(const char *s, uint8_t *ret) {

-        char *x = NULL;

+        unsigned base = 0;

         unsigned long l;

+        char *x = NULL;

         assert(s);

         s += strspn(s, WHITESPACE);

+        s = mangle_base(s, &base);

         errno = 0;

-        l = strtoul(s, &x, 0);

+        l = strtoul(s, &x, base);

         if (errno > 0)

                 return -errno;

         if (!x || x == s || *x != 0)

@@ -546,6 +586,8 @@ int safe_atou16_full(const char *s, unsigned base, uint16_t *ret) {

             s[0] == '0' && s[1] != 0)

                 return -EINVAL;

+        s = mangle_base(s, &base);

+

         errno = 0;

         l = strtoul(s, &x, SAFE_ATO_MASK_FLAGS(base));

         if (errno > 0)

@@ -564,13 +606,17 @@ int safe_atou16_full(const char *s, unsigned base, uint16_t *ret) {

 }

 int safe_atoi16(const char *s, int16_t *ret) {

+        unsigned base = 0;

         char *x = NULL;

         long l;

         assert(s);

+        s += strspn(s, WHITESPACE);

+        s = mangle_base(s, &base);

+

         errno = 0;

-        l = strtol(s, &x, 0);

+        l = strtol(s, &x, base);

         if (errno > 0)

                 return -errno;

         if (!x || x == s || *x != 0)