X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Flast_char_is.c;h=aaa85ddd9c4e9b105964d2f0b38555c7c478a66e;hb=fe5e23bf75043302a3492c9a7cd2f30f20f51b2e;hp=3616d5916df60f60a91634e35d1ad5e16b614cdc;hpb=809a6e310443d0b5010c8b293cab0160608c1b02;p=oweals%2Fbusybox.git

diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index 3616d5916..aaa85ddd9 100644
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -9,15 +9,15 @@
 
 #include "libbb.h"
 
-/* Find out if the last character of a string matches the one given Don't
- * underrun the buffer if the string length is 0.  Also avoids a possible
- * space-hogging inline of strlen() per usage.
+/* Find out if the last character of a string matches the one given.
+ * Don't underrun the buffer if the string length is 0.
  */
 char* last_char_is(const char *s, int c)
 {
-	if (s) {
-		s = strrchr(s, c);
-		if (s && !s[1])
+	if (s && *s) {
+		size_t sz = strlen(s) - 1;
+		s += sz;
+		if ( (unsigned char)*s == c)
 			return (char*)s;
 	}
 	return NULL;