- fixes from Tito

diff --git a/libbb/strrstr.c b/libbb/strrstr.c
index 5a2685920f4a8c8026c171ce634a56dd745a5bb7..126fed75cea40787e51327f393596911e0352715 100644 (file)
--- a/libbb/strrstr.c
+++ b/libbb/strrstr.c
@@ -13,19 +13,16 @@
  * The strrstr() function finds the last occurrence of the substring needle
  * in the string haystack. The terminating nul characters are not compared.
  */
-char* strrstr(const char *haystack, const char *needle)
+char *strrstr(const char *haystack, const char *needle)
 {
        char *r = NULL;
-
-       if (!needle[0])
-                       return r;
-       while (1) {
-                       char *p = strstr(haystack, needle);
-                       if (!p)
-                                       return r;
+       
+       do {
+               char *p = strstr(haystack, needle);
+               if (p)
                        r = p;
-                       haystack = p + 1;
-       }
+       } while (*haystack++);
+       return r;
 }
 
 #ifdef __DO_STRRSTR_TEST