This is Vladimir's update to last_char_is(). Since 'char *' is

the least common denominator, I modified it to use that (not const),
which will minimize the need for casting elsewhere.

diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index b4bb7ec32fad30cbae5177498d6e3653a787af92..36b695b40af3136a6135efcf013a11702f51b02f 100644 (file)
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -25,9 +25,12 @@
  * underrun the buffer if the string length is 0.  Also avoids a possible
  * space-hogging inline of strlen() per usage.
  */
-int last_char_is(const char *s, const int c)
+char * last_char_is(char *s, int c)
 {
-       int  l = strlen(s);
-       if (l==0) return 0;
-       return (s[l-1] == c);
+       char *sret  = s+strlen(s)-1;
+       if (sret>=s && *sret == c) { 
+               return sret;
+       } else {
+               return NULL;
+       }
 }