strim: Sync up with Linux version

Linux changed the behaviour of strim() so that a string with only spaces
reduces places the terminator at the start of the string, rather than
returning a pointer to the end of the string.

Bring in this version, from Linux v6.14

Add a comment about the new behaviour.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/lib/linux_string.c b/lib/linux_string.c
index d5a5e08d98c140dc50c996b805a0eea39e4aab8e..4b92cd923f2e896560d72603ad0112e129bdce2c 100644 (file)
--- a/lib/linux_string.c
+++ b/lib/linux_string.c
@@ -31,13 +31,15 @@ char *skip_spaces(const char *str)
  * Note that the first trailing whitespace is replaced with a %NUL-terminator
  * in the given string @s. Returns a pointer to the first non-whitespace
  * character in @s.
+ *
+ * Note that if the string consist of only spaces, then the terminator is placed
+ * at the start of the string, with the return value pointing there also.
  */
 char *strim(char *s)
 {
        size_t size;
        char *end;
 
-       s = skip_spaces(s);
        size = strlen(s);
        if (!size)
                return s;
@@ -47,5 +49,5 @@ char *strim(char *s)
                end--;
        *(end + 1) = '\0';
 
-       return s;
+       return skip_spaces(s);
 }