From 64dec33725690adf8cbe9dc931b8a0517e09bf1c Mon Sep 17 00:00:00 2001 From: vda Date: Sat, 16 Dec 2006 22:18:44 +0000 Subject: diff: fix -q exit code last_char_is: sacrifice 9 bytes but avoid double-scan git-svn-id: svn://busybox.net/trunk/busybox@16974 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- libbb/last_char_is.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libbb') 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; -- cgit v1.2.3-55-g6feb