From 106540f53db1a9b8d72f5392c343b9582a445044 Mon Sep 17 00:00:00 2001
From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Tue, 18 Oct 2016 16:33:12 +0100
Subject: [PATCH] Rewrite r1bindex() using strrchr(3).

---
 sbr/r1bindex.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/sbr/r1bindex.c b/sbr/r1bindex.c
index 92818f9a..b4ad0e8f 100644
--- a/sbr/r1bindex.c
+++ b/sbr/r1bindex.c
@@ -12,23 +12,17 @@
 
 #include <h/mh.h>
 
-
 char *
 r1bindex(char *str, int chr)
 {
-    char *cp;
-
-    /* find null at the end of the string */
-    for (cp = str; *cp; cp++)
-	continue;
+    char *r;
 
-    /* backup to the rightmost character */
-    --cp;
+    if (!chr)
+        return str; /* Match old behaviour, don't know if it's used. */
 
-    /* now search for the rightmost occurrence of the character */
-    while (cp >= str && *cp != chr)
-	--cp;
+    r = strrchr(str, chr);
+    if (r)
+        return r + 1;
 
-    /* now move one to the right */
-    return (++cp);
+    return str;
 }
-- 
2.56.0