summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-04-20 11:02:18 -0400
committerAllan McRae <allan@archlinux.org>2014-04-21 20:25:45 +1000
commit5293d5784049869c965ee21f424b8845bdebb745 (patch)
tree1acd0297fbca0985defb4dd4f7fa1207502efb47
parent6103183253f16edf32fb5c01a288a80a50092d88 (diff)
downloadpacman-5293d5784049869c965ee21f424b8845bdebb745.tar.gz
pacman-5293d5784049869c965ee21f424b8845bdebb745.zip
strtrim: reset pointer after trimming leading whitespace
Breakage introduced in 92216c5864efccac when we changed the signature of strtrim to return something more useful. Fixes FS#39976. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--src/pacman/util.c1
-rw-r--r--src/util/pactree.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/pacman/util.c b/src/pacman/util.c
index d42e27b8..ec2d3d2b 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -299,6 +299,7 @@ size_t strtrim(char *str)
size_t len = strlen(pch);
if(len) {
memmove(str, pch, len + 1);
+ pch = str;
} else {
*str = '\0';
}
diff --git a/src/util/pactree.c b/src/util/pactree.c
index 6c620aac..5c765428 100644
--- a/src/util/pactree.c
+++ b/src/util/pactree.c
@@ -159,6 +159,7 @@ static size_t strtrim(char *str)
size_t len = strlen(pch);
if(len) {
memmove(str, pch, len + 1);
+ pch = str;
} else {
*str = '\0';
}