summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2020-07-19 20:49:22 +0200
committerDenys Vlasenko2020-07-19 20:49:22 +0200
commit79a4032eefe405a1e7d4a644614fcc4a07b98d88 (patch)
tree0b85959dc4eea1c1b9063acac8ce39ac775450fb /libbb
parent4468c569f7112f4f6892dad52fd784ef4c22c44e (diff)
downloadbusybox-79a4032eefe405a1e7d4a644614fcc4a07b98d88.zip
busybox-79a4032eefe405a1e7d4a644614fcc4a07b98d88.tar.gz
libbb: shrink last_char_is(), no longer allow NULL string argument
function old new delta last_char_is 40 28 -12 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/last_char_is.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index 918526e..fba05f9 100644
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -11,14 +11,9 @@
/* Find out if the last character of a string matches the one given */
char* FAST_FUNC last_char_is(const char *s, int c)
{
- if (s) {
- size_t sz = strlen(s);
- /* Don't underrun the buffer if the string length is 0 */
- if (sz != 0) {
- s += sz - 1;
- if ((unsigned char)*s == c)
- return (char*)s;
- }
- }
- return NULL;
+ if (!s[0])
+ return NULL;
+ while (s[1])
+ s++;
+ return (*s == (char)c) ? (char *) s : NULL;
}