Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/last_char_is.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/last_char_is.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/libbb/last_char_is.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * busybox library eXtended function
@@ -4 +5 @@
  * Copyright (C) 2001 Larry Doolittle, <ldoolitt@recycle.lbl.gov>
  *
- * 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 <string.h>
 #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* last_char_is(const char *s, int c)
 {
-    char *sret = (char *)s;
-    if (sret) {
-        sret = strrchr(sret, c);
-        if(sret != NULL && *(sret+1) != 0)
-            sret = NULL;
+    if (s && *s) {
+        size_t sz = strlen(s) - 1;
+        s += sz;
+        if ( (unsigned char)*s == c)
+            return (char*)s;
     }
-    return sret;
+    return NULL;
 }