From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/libbb/last_char_is.c | 38 +++++++------------------ 1 file changed, 11 insertions(+), 27 deletions(-) (limited to 'release/src/router/busybox/libbb/last_char_is.c') diff --git a/release/src/router/busybox/libbb/last_char_is.c b/release/src/router/busybox/libbb/last_char_is.c index 4e2ee92e..b0592568 100644 --- a/release/src/router/busybox/libbb/last_char_is.c +++ b/release/src/router/busybox/libbb/last_char_is.c @@ -1,40 +1,24 @@ +/* vi: set sw=4 ts=4: */ /* * busybox library eXtended function * * Copyright (C) 2001 Larry Doolittle, * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include #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) +char* FAST_FUNC last_char_is(const char *s, int c) { - char *sret; - if (!s) - return NULL; - sret = (char *)s+strlen(s)-1; - if (sret>=s && *sret == c) { - return sret; - } else { - return NULL; + 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-54-g00ecf