summaryrefslogtreecommitdiff
path: root/usr.bin/window
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1997-01-17 07:14:33 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1997-01-17 07:14:33 +0000
commit3e150a880447536a0af58c395e5a857635e985d3 (patch)
tree867c3504f60ee9bfd2fa5db3dd66d5b3a1649ecd /usr.bin/window
parent8e78a24e2e89c03ac53bd758a1781c925fe7ab71 (diff)
r?index -> strr?chr
Diffstat (limited to 'usr.bin/window')
-rw-r--r--usr.bin/window/lcmd1.c6
-rw-r--r--usr.bin/window/lcmd2.c6
-rw-r--r--usr.bin/window/main.c8
3 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/window/lcmd1.c b/usr.bin/window/lcmd1.c
index 0b7d1110ebd..4618724713a 100644
--- a/usr.bin/window/lcmd1.c
+++ b/usr.bin/window/lcmd1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcmd1.c,v 1.3 1996/06/26 05:43:15 deraadt Exp $ */
+/* $OpenBSD: lcmd1.c,v 1.4 1997/01/17 07:13:51 millert Exp $ */
/* $NetBSD: lcmd1.c,v 1.6 1996/02/08 20:45:00 mycroft Exp $ */
/*
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lcmd1.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: lcmd1.c,v 1.3 1996/06/26 05:43:15 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lcmd1.c,v 1.4 1997/01/17 07:13:51 millert Exp $";
#endif
#endif /* not lint */
@@ -109,7 +109,7 @@ register struct value *a;
*pp = a->v_str;
*pp = 0;
shf = *(sh = argv);
- if (*sh = rindex(shf, '/'))
+ if (*sh = strrchr(shf, '/'))
(*sh)++;
else
*sh = shf;
diff --git a/usr.bin/window/lcmd2.c b/usr.bin/window/lcmd2.c
index 6b7d8a22afb..6a012bbcd97 100644
--- a/usr.bin/window/lcmd2.c
+++ b/usr.bin/window/lcmd2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcmd2.c,v 1.2 1996/06/26 05:43:15 deraadt Exp $ */
+/* $OpenBSD: lcmd2.c,v 1.3 1997/01/17 07:13:52 millert Exp $ */
/* $NetBSD: lcmd2.c,v 1.7 1995/09/29 00:44:04 cgd Exp $ */
/*
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lcmd2.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.2 1996/06/26 05:43:15 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.3 1997/01/17 07:13:52 millert Exp $";
#endif
#endif /* not lint */
@@ -285,7 +285,7 @@ l_def_shell(v, a)
break;
}
if (default_shellfile = *default_shell)
- if (*default_shell = rindex(default_shellfile, '/'))
+ if (*default_shell = strrchr(default_shellfile, '/'))
(*default_shell)++;
else
*default_shell = default_shellfile;
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index 4f2303676bd..422a5ef0390 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.4 1996/06/26 05:43:17 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.5 1997/01/17 07:13:52 millert Exp $ */
/* $NetBSD: main.c,v 1.6 1996/02/08 20:45:01 mycroft Exp $ */
/*
@@ -47,7 +47,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.4 1996/06/26 05:43:17 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.5 1997/01/17 07:13:52 millert Exp $";
#endif
#endif /* not lint */
@@ -72,7 +72,7 @@ char **argv;
char tflag = 0;
escapec = ESCAPEC;
- if (p = rindex(*argv, '/'))
+ if (p = strrchr(*argv, '/'))
p++;
else
p = *argv;
@@ -118,7 +118,7 @@ char **argv;
(void) fprintf(stderr, "Out of memory.\n");
exit(1);
}
- if (p = rindex(default_shellfile, '/'))
+ if (p = strrchr(default_shellfile, '/'))
p++;
else
p = default_shellfile;