Delivered-To: mlmmj-tyndur-devel
Received: from sv1.famkaufmann.info [176.9.73.67]
	by a9b8c5461646 with IMAP (fetchmail-6.3.26)
	for <mlmmj@localhost> (single-drop); Wed, 03 Mar 2021 19:00:18 +0000 (GMT)
Received: from localhost ([172.29.0.7])
	by sv1.famkaufmann.info with LMTP
	id ELGBOrTcP2AkIwAALHnFKQ
	(envelope-from <mayernico256@gmail.com>)
	for <mlmmj-tyndur-devel>; Wed, 03 Mar 2021 19:00:04 +0000
Delivered-To: tyndur-devel@tyndur.org
Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [2a00:1450:4864:20::536])
	by sv1.famkaufmann.info (OpenSMTPD) with ESMTPS id 6fcf0d64 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
	for <tyndur-devel@tyndur.org>;
	Wed, 3 Mar 2021 19:00:04 +0000 (UTC)
Received: by mail-ed1-x536.google.com with SMTP id d13so26441549edp.4
        for <tyndur-devel@tyndur.org>; Wed, 03 Mar 2021 11:00:04 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=from:to:subject:date:message-id:mime-version
         :content-transfer-encoding;
        bh=T+idouL59Et/R1rVpirhiidyL+1PNgkaX7etaUgAkJY=;
        b=b6805YrGS/Z20xVmanlP+5PqgIEhk7YjrEcyG8lR+PM+9stlsbmw6761rA9LR38VbE
         tFeskFZu9q1eGpWJrb6wYulmAf0PC0eyCuuMz88/VgCnM5tVffdGaOcRXv2mlhajhCLv
         upK03CvZUAsZTCCzmP6yq7raCRr5K6onso8Q0fkvBMd0hTH4xYO7GhTqNC5hNJWNQ0Sk
         KPme5szg3TosYX+13jfgZgCwBMnMJtHf2qtuwXzt4redZDjYiO4CbSlimNAmUcurGRDb
         kdoFzctFiKKce5mACe6qpHsx7dAj+qV4wWrPphSNrIZBl/QXd8vEKh7ukdw5ZzGkcjBo
         1gWQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:from:to:subject:date:message-id:mime-version
         :content-transfer-encoding;
        bh=T+idouL59Et/R1rVpirhiidyL+1PNgkaX7etaUgAkJY=;
        b=Z97wrkkqAs60tzJ50BKdxA3a9KWkFx94B0E31U7/CiBdJJhnAMKF8Qo0vIO3UpvaEB
         mEVoTnXf1RMQK4blUSff2dcaLzOMkNBCGaC4oKpQbPo7XfbUJW8qIY39tHoGNhzPnbAF
         f/4tgV180Kiec2UarpRbSmvwWOFQPEmAsk9R852HBgr9u5UG45mTdRbaMTDbSS17Ly47
         5wYA5R3aGLTWOy9gvfCKIsV98hErY6EBEg0EFZCE6xsLqrZevaHQG73nz75kfObvzuDM
         qFuvn/NNOYtbTj0FRoDZcQGppud74sR5b3A/B0KjdG5KbjhjZPJqCdvfmmxHhxXqwToL
         qYOQ==
X-Gm-Message-State: AOAM531WJjnDfjniMCaUlYtSs30cd4qadj/IMB63WhqcrS2cdDS9zcLc
	cLbgrqeI5IUJk2kjgeSmJpax5+45qPG61Q==
X-Google-Smtp-Source: ABdhPJyWzakPzZaanm9jK4FMzAxvRWEj1rCUcOZFyp+PB32l+bq0FNpOdV/YvgArXHSGhzCtOqNorA==
X-Received: by 2002:a05:6402:17e7:: with SMTP id t7mr790526edy.44.1614798003949;
        Wed, 03 Mar 2021 11:00:03 -0800 (PST)
Received: from localhost.localdomain (p57a5fb43.dip0.t-ipconnect.de. [87.165.251.67])
        by smtp.gmail.com with ESMTPSA id c20sm21945884eja.22.2021.03.03.11.00.03
        for <tyndur-devel@tyndur.org>
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Wed, 03 Mar 2021 11:00:03 -0800 (PST)
From: Nico Mayer <mayernico256@gmail.com>
X-Google-Original-From: Nico Mayer <mayerNico256@gmail.com>
To: tyndur-devel@tyndur.org
Subject: [PATCH v1 1/2] libc: Zentralisieren der strtoxxx-Funktionen
Date: Wed,  3 Mar 2021 19:59:55 +0100
Message-Id: <20210303185956.4780-1-mayerNico256@gmail.com>
X-Mailer: git-send-email 2.29.2
Errors-To: toni@tyndur.org
Precedence: list
Reply-To: tyndur-Patches <tyndur-devel@tyndur.org>
List-Id: tyndur-Patches <tyndur-devel.tyndur.org>
List-Unsubscribe: <mailto:tyndur-devel+unsubscribe@tyndur.org>
List-Post: <mailto:tyndur-devel@tyndur.org>
List-Help: <mailto:tyndur-devel+help@tyndur.org>
List-Subscribe: <mailto:tyndur-devel+subscribe@tyndur.org>
List-Owner: <mailto:toni@tyndur.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

From: Nico Mayer <mayerNico@outlook.de>

* Bisher gibt es ein gewisses Durcheinander, was die strtoxxx-Funktionen
  anbelangt. Die Funktionen strtol und strtoll werden in der Datei
  strtol.c implementiert. Die Funktionen strtoul und strtoull werden
  wiederum direkt in string.c implementiert. Dieser Commit zentralisiert
  die Implementierung der verschiedenen strtoxxx-Funktionen. Alle
  strtoxxx-Funktionen jetzt werden durch die Datei strtol.c implementiert.

Signed-off-by: Nico Mayer <mayerNico@outlook.de>
---
 src/lib/stdlibc/strtol.c | 130 ++++++++++++++++++++++++++++-----------
 src/lib/string.c         | 104 -------------------------------
 2 files changed, 95 insertions(+), 139 deletions(-)

diff --git a/src/lib/stdlibc/strtol.c b/src/lib/stdlibc/strtol.c
index 0160ebcf..c8e70e6b 100644
--- a/src/lib/stdlibc/strtol.c
+++ b/src/lib/stdlibc/strtol.c
@@ -31,76 +31,136 @@
 #include "limits.h"
 #include "types.h"
 
-static long long do_strtoll(const char *str, char **endptr, int base,
-                            long long min_val, long long max_val)
+static long long do_strtoull(const char *str, char **endptr, int base,
+                            unsigned long long max_val,
+                            unsigned long long min_val)
 {
-    long long retval = 0;
-    int overflow = 0;
-    char sign = 0;
+    unsigned long long result = 0;
+    int neg = 0;
     int digit;
+    int overflow = 0;
 
+    // Leerzeichen am Anfang muessen ignoriert werden
     while (isspace(*str)) {
         str++;
     }
 
-    // Moegliches Vorzeichen auswerten
-    if (*str == '+' || *str == '-') {
-        sign = *str;
+    // Vorzeichen
+    if (*str == '+') {
+        str++;
+    } else if (*str == '-') {
+        neg = 1;
         str++;
     }
 
-    // Moegliches 0, 0x und 0X auswerten
-    if (*str == '0')
-    {
-        if (str[1] == 'x' || str[1] == 'X') {
-            if (base == 0) {
-                base = 16;
+    // Basis feststellen
+    // Bei Basis 16 darf der String mit 0x anfangen
+    // Bei Basis 0 ist automatische Erkennung
+    //   Anfang ist 0x: Basis 16
+    //   Anfang ist 0:  Basis 8
+    //   Ansonsten:     Basis 10
+    switch (base) {
+        case 0:
+            base = 10;
+            if (*str == '0') {
+                str++;
+                if (*str == 'x' || *str == 'X') {
+                    if (isxdigit(str[1])) {
+                        base = 16;
+                        str++;
+                    }
+                } else {
+                    base = 8;
+                }
             }
+            break;
 
-            if (base == 16 && isxdigit(str[2])) {
+        case 16:
+            if ((*str == '0') && (str[1] == 'x' || str[1] == 'X')
+                && isxdigit(str[2]))
+            {
                 str += 2;
             }
-        } else if (base == 0) {
-            base = 8;
-        }
+            break;
     }
 
-    while (*str)
-    {
-        if (isdigit(*str) && *str - '0' < base) {
-            digit = *str - '0';
-        } else if(isalpha(*str) && tolower(*str) - 'a' + 10 < base) {
-            digit = tolower(*str) - 'a' + 10;
-        } else {
-            break;
+    // Ergebnis berechnen
+    result = 0;
+    while (*str) {
+        switch (*str) {
+            case '0' ... '9':
+                if (*str - '0' > base - 1) {
+                    goto out;
+                }
+                digit = *str - '0';
+                break;
+            case 'A' ... 'Z':
+                if (*str - 'A' + 10 > base - 1) {
+                    goto out;
+                }
+                digit = *str - 'A' + 10;
+                break;
+            case 'a' ... 'z':
+                if (*str - 'a' + 10 > base - 1) {
+                    goto out;
+                }
+                digit = *str - 'a' + 10;
+                break;
+
+            default:
+                goto out;
         }
 
-        if (retval > (max_val - digit) / base) {
-            overflow = 1;
+        if (neg) {
+            if (result > (min_val - digit) / base) {
+                errno = ERANGE;
+                overflow = 1;
+                goto out;
+            }
+        } else {
+            if (result > (max_val - digit) / base) {
+                errno = ERANGE;
+                overflow = 1;
+                goto out;
+            }
         }
-        retval = retval * base + digit;
+
+        result = result * base + digit;
 
         str++;
     }
+out:
 
     if (endptr != NULL) {
-        *(const char**)endptr = str;
+        *endptr = (char*) str;
     }
 
     if (overflow) {
-        errno = ERANGE;
-        return (sign == '-') ? min_val : max_val;
+        return neg ? min_val : max_val;
     }
 
-    return (sign == '-') ? -retval : retval;
+    return neg ? - result : result;
 }
 
+
 long long strtoll(const char *str, char **endptr, int base)
 {
-    return do_strtoll(str, endptr, base, LLONG_MIN, LLONG_MAX);
+    return (long long)do_strtoull(str, endptr, base, LLONG_MAX, LLONG_MIN);
 }
 
 long strtol(const char *str, char **endptr, int base)
 {
-    return do_strtoll(str, endptr, base, LONG_MIN, LONG_MAX);
+    return (long)do_strtoull(str, endptr, base, LONG_MAX, LONG_MIN);
+}
+
+unsigned long long strtoull(const char *str, char **endptr, int base)
+{
+    return (unsigned long long)do_strtoull(str, endptr, base,
+                                           ULLONG_MAX, ULLONG_MAX);
 }
+
+unsigned long strtoul(const char *str, char **endptr, int base)
+{
+    return (unsigned long)do_strtoull(str, endptr, base, ULONG_MAX, ULONG_MAX);
+}
+
diff --git a/src/lib/string.c b/src/lib/string.c
index 98861869..630e4f0e 100644
--- a/src/lib/string.c
+++ b/src/lib/string.c
@@ -67,110 +67,6 @@ void itoa(unsigned int n, char *s, unsigned int base)
 	s[y] = '\0';
 }
 
-unsigned long long int strtoull(const char *nptr, char **endptr, int base)
-{
-    unsigned long long int result = 0;
-    int neg = 0;
-    int digit;
-    bool overflow = false;
-
-    // Leerzeichen am Anfang muessen ignoriert werden
-    while (isspace(*nptr)) {
-        nptr++;
-    }
-
-    // Vorzeichen
-    if (*nptr == '+') {
-        nptr++;
-    } else if (*nptr == '-') {
-        neg = 1;
-        nptr++;
-    }
-
-    // Basis feststellen
-    // Bei Basis 16 darf der String mit 0x anfangen
-    // Bei Basis 0 ist automatische Erkennung
-    //   Anfang ist 0x: Basis 16
-    //   Anfang ist 0:  Basis 8
-    //   Ansonsten:     Basis 10
-    switch (base) {
-        case 0:
-            base = 10;
-            if (*nptr == '0') {
-                nptr++;
-                if (*nptr == 'x' || *nptr == 'X') {
-                    if (isxdigit(nptr[1])) {
-                        base = 16;
-                        nptr++;
-                    }
-                } else {
-                    base = 8;
-                }
-            }
-            break;
-
-        case 16:
-            if ((*nptr == '0') && (nptr[1] == 'x' || nptr[1] == 'X')
-                && isxdigit(nptr[2]))
-            {
-                nptr += 2;
-            }
-            break;
-    }
-
-    // Ergebnis berechnen
-    result = 0;
-    while (*nptr) {
-        switch (*nptr) {
-            case '0' ... '9':
-                if (*nptr - '0' > base - 1) {
-                    goto out;
-                }
-                digit = *nptr - '0';
-                break;
-            case 'A' ... 'Z':
-                if (*nptr - 'A' + 10 > base - 1) {
-                    goto out;
-                }
-                digit = *nptr - 'A' + 10;
-                break;
-            case 'a' ... 'z':
-                if (*nptr - 'a' + 10 > base - 1) {
-                    goto out;
-                }
-                digit = *nptr - 'a' + 10;
-                break;
-
-            default:
-                goto out;
-        }
-
-        if (result > (ULLONG_MAX - digit) / base) {
-            overflow = true;
-        }
-        result = result * base + digit;
-
-        nptr++;
-    }
-out:
-
-    if (endptr != NULL) {
-        *endptr = (char*) nptr;
-    }
-
-    if (overflow) {
-        return ULLONG_MAX;
-    }
-
-    return neg ? - result : result;
-}
-
-unsigned long int strtoul(const char *nptr, char **endptr, int base)
-{
-    return (unsigned long int) strtoull(nptr, endptr, base);
-}
-
-
 int atoi(const char *s)
 {
     return (int) strtoull(s, NULL, 10);
-- 
2.29.2

