diff --git a/missing/strchr.c b/missing/strchr.c
index 82f3cc96b0..886d70ede6 100644
--- a/missing/strchr.c
+++ b/missing/strchr.c
@@ -19,8 +19,10 @@ strrchr(s, c)
     char *s;
     int c;
 {
-    char *save = 0;
+    char *save;
 
+    if (c == 0) return s + strlen(s);
+    save = 0;
     while (*s) {
 	if (*s == c)
 	    save = s;