basic/strv: use SWAP_TWO() macro (#3602)

[elogind.git] / src / basic / string-util.c

diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 6006767daac5b025fdb56e44fd28d82a2443f20b..293a15f9c041cf59f5354829cfdc86b0b0622a20 100644 (file)
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-

 /***
   This file is part of systemd.
 
 /***
   This file is part of systemd.
 


@@ -19,8 +17,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

+#include <errno.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+

 #include "alloc-util.h"
 #include "gunicode.h"
 #include "alloc-util.h"
 #include "gunicode.h"

+#include "macro.h"

 #include "string-util.h"
 #include "utf8.h"
 #include "util.h"
 #include "string-util.h"
 #include "utf8.h"
 #include "util.h"


@@ -310,18 +315,67 @@ char *truncate_nl(char *s) {
         return s;
 }
 
         return s;
 }
 

+char ascii_tolower(char x) {
+
+        if (x >= 'A' && x <= 'Z')
+                return x - 'A' + 'a';
+
+        return x;
+}
+

 char *ascii_strlower(char *t) {
         char *p;
 
         assert(t);
 
         for (p = t; *p; p++)
 char *ascii_strlower(char *t) {
         char *p;
 
         assert(t);
 
         for (p = t; *p; p++)

-                if (*p >= 'A' && *p <= 'Z')
-                        *p = *p - 'A' + 'a';
+                *p = ascii_tolower(*p);
+
+        return t;
+}
+
+char *ascii_strlower_n(char *t, size_t n) {
+        size_t i;
+
+        if (n <= 0)
+                return t;
+
+        for (i = 0; i < n; i++)
+                t[i] = ascii_tolower(t[i]);

 
         return t;
 }
 
 
         return t;
 }
 

+int ascii_strcasecmp_n(const char *a, const char *b, size_t n) {
+
+        for (; n > 0; a++, b++, n--) {
+                int x, y;
+
+                x = (int) (uint8_t) ascii_tolower(*a);
+                y = (int) (uint8_t) ascii_tolower(*b);
+
+                if (x != y)
+                        return x - y;
+        }
+
+        return 0;
+}
+
+int ascii_strcasecmp_nn(const char *a, size_t n, const char *b, size_t m) {
+        int r;
+
+        r = ascii_strcasecmp_n(a, b, MIN(n, m));
+        if (r != 0)
+                return r;
+
+        if (n < m)
+                return -1;
+        else if (n > m)
+                return 1;
+        else
+                return 0;
+}
+

 bool chars_intersect(const char *a, const char *b) {
         const char *p;
 
 bool chars_intersect(const char *a, const char *b) {
         const char *p;
 


@@ -394,6 +448,7 @@ char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigne
         char *e;
         const char *i, *j;
         unsigned k, len, len2;
         char *e;
         const char *i, *j;
         unsigned k, len, len2;

+        int r;

 
         assert(s);
         assert(percent <= 100);
 
         assert(s);
         assert(percent <= 100);


@@ -413,23 +468,23 @@ char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigne
 
         k = 0;
         for (i = s; k < x && i < s + old_length; i = utf8_next_char(i)) {
 
         k = 0;
         for (i = s; k < x && i < s + old_length; i = utf8_next_char(i)) {

-                int c;
+                char32_t c;

 
 

-                c = utf8_encoded_to_unichar(i);
-                if (c < 0)
+                r = utf8_encoded_to_unichar(i, &c);
+                if (r < 0)

                         return NULL;
                 k += unichar_iswide(c) ? 2 : 1;
         }
 
         if (k > x) /* last character was wide and went over quota */
                         return NULL;
                 k += unichar_iswide(c) ? 2 : 1;
         }
 
         if (k > x) /* last character was wide and went over quota */

-                x ++;
+                x++;

 
         for (j = s + old_length; k < new_length && j > i; ) {
 
         for (j = s + old_length; k < new_length && j > i; ) {

-                int c;
+                char32_t c;

 
                 j = utf8_prev_char(j);
 
                 j = utf8_prev_char(j);

-                c = utf8_encoded_to_unichar(j);
-                if (c < 0)
+                r = utf8_encoded_to_unichar(j, &c);
+                if (r < 0)

                         return NULL;
                 k += unichar_iswide(c) ? 2 : 1;
         }
                         return NULL;
                 k += unichar_iswide(c) ? 2 : 1;
         }