index -> strchr and rindex -> strrchr to reduce the number of gratuitous

diffes with NetBSD/OpenBSD.  These changes seem to predate the NetBSD/OpenBSD
split, so it is hard to give proper credit for them.
Obtained from: OpenBSD.

2 files changed, 6 insertions, 6 deletions

diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 44a839d..84240d2 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -653,7 +653,7 @@ print(format, file)
 		   printer, format);
 		return(ERROR);
 	}
-	if ((av[0] = rindex(prog, '/')) != NULL)
+	if ((av[0] = strrchr(prog, '/')) != NULL)
 		av[0]++;
 	else
 		av[0] = prog;
@@ -882,7 +882,7 @@ sendfile(type, file, format)
 				syslog(LOG_ERR, "mkstemp: %m");
 				return(ERROR);
 			}
-			if ((av[0] = rindex(IF, '/')) == NULL)
+			if ((av[0] = strrchr(IF, '/')) == NULL)
 				av[0] = IF;
 			else
 				av[0]++;
@@ -1193,7 +1193,7 @@ sendmail(user, bombed)
 		closelog();
 		for (i = 3, dtablesize = getdtablesize(); i < dtablesize; i++)
 			(void) close(i);
-		if ((cp = rindex(_PATH_SENDMAIL, '/')) != NULL)
+		if ((cp = strrchr(_PATH_SENDMAIL, '/')) != NULL)
 			cp++;
 	else
 			cp = _PATH_SENDMAIL;
@@ -1385,7 +1385,7 @@ openpr()
 	char *cp;
 
 	if (!remote && *LP) {
-		if (cp = index(LP, '@'))
+		if (cp = strchr(LP, '@'))
 			opennet(cp);
 		else
 			opentty();
@@ -1416,7 +1416,7 @@ openpr()
 			for (i = 3, dtablesize = getdtablesize();
 			     i < dtablesize; i++)
 				(void) close(i);
-			if ((cp = rindex(OF, '/')) == NULL)
+			if ((cp = strrchr(OF, '/')) == NULL)
 				cp = OF;
 			else
 				cp++;
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index b1b0a77..3bfbb99 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -200,7 +200,7 @@ readjob()
 			}
 			(void) strncpy(dfname, cp, sizeof dfname-1);
 			dfname[sizeof dfname-1] = '\0';
-			if (index(dfname, '/'))
+			if (strchr(dfname, '/'))
 				frecverr("readjob: %s: illegal path name",
 					dfname);
 			(void) readfile(dfname, size);