From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 10 Nov 2017 20:41:53 +0000 (+0100)
Subject: string-util: when ellipsizing to a length if (size_t) -1, become a NOP
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b6015ad21060c42dcd2d0616033b0f2957facb99;p=elogind.git

string-util: when ellipsizing to a length if (size_t) -1, become a NOP

Let's say that (size_t) -1 (i.e. SIZE_T_MAX) is equivalent to
"unbounded" ellipsation, i.e. ellipsation as NOP. In which case the
relevant functions become little more than strdup()/strndup().

This is useful to simplify caller code in case we want to turn off
ellipsation in certain code paths with minimal caller-side handling for
this.
---

diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 6ef52ca88..a87de90af 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -476,6 +476,10 @@ char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigne
 
         assert(s);
         assert(percent <= 100);
+
+        if (new_length == (size_t) -1)
+                return strndup(s, old_length);
+
         assert(new_length >= 3);
 
         /* if no multibyte characters use ascii_ellipsize_mem for speed */
@@ -543,6 +547,10 @@ char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigne
 }
 
 char *ellipsize(const char *s, size_t length, unsigned percent) {
+
+        if (length == (size_t) -1)
+                return strdup(s);
+
         return ellipsize_mem(s, strlen(s), length, percent);
 }