uip: Replace some ints that are only ever 0 or 1 with bool.

[nmh] / sbr / r1bindex.c

diff --git a/sbr/r1bindex.c b/sbr/r1bindex.c
index 92818f9a5f68455a975ad09197447298e436973d..0fd8d51d0e96f21f7f2b32af15d6e4ba54f9dc20 100644 (file)
--- a/sbr/r1bindex.c
+++ b/sbr/r1bindex.c
@@ -1,6 +1,4 @@
-
-/*
- * r1bindex.c -- Given a string and a character, return a pointer
+/* r1bindex.c -- Given a string and a character, return a pointer

  *            -- to the right of the rightmost occurrence of the
  *            -- character.  If the character doesn't occur, the
  *            -- pointer will be at the beginning of the string.
  *            -- to the right of the rightmost occurrence of the
  *            -- character.  If the character doesn't occur, the
  *            -- pointer will be at the beginning of the string.


@@ -12,23 +10,18 @@
 
 #include <h/mh.h>
 
 
 #include <h/mh.h>
 

-
+/* Does not return NULL. */

 char *
 r1bindex(char *str, int chr)
 {
 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;

 }
 }