From d917a6370dcedce67edf7e07afc136151fcf9b5e Mon Sep 17 00:00:00 2001 From: mikel Date: Thu, 6 Mar 1997 06:26:07 +0000 Subject: [PATCH] RCSid police; getopt() return type police; rindex() -> strrchr() --- usr.sbin/chown/Makefile | 2 +- usr.sbin/chown/chgrp.1 | 2 +- usr.sbin/chown/chown.8 | 2 +- usr.sbin/chown/chown.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile index 0a2512fc3057..0fc875c3f61e 100644 --- a/usr.sbin/chown/Makefile +++ b/usr.sbin/chown/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $Id: Makefile,v 1.5 1994/12/22 11:33:27 cgd Exp $ +# $NetBSD: Makefile,v 1.6 1997/03/06 06:26:07 mikel Exp $ PROG= chown CFLAGS+=-DSUPPORT_DOT diff --git a/usr.sbin/chown/chgrp.1 b/usr.sbin/chown/chgrp.1 index 546f5bed952a..f18c9f9a733b 100644 --- a/usr.sbin/chown/chgrp.1 +++ b/usr.sbin/chown/chgrp.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)chgrp.1 8.3 (Berkeley) 3/31/94 -.\" $Id: chgrp.1,v 1.4 1994/06/18 20:55:56 cgd Exp $ +.\" $NetBSD: chgrp.1,v 1.5 1997/03/06 06:26:08 mikel Exp $ .\" .Dd March 31, 1994 .Dt CHGRP 1 diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8 index ddf43f1ad48f..117757215f55 100644 --- a/usr.sbin/chown/chown.8 +++ b/usr.sbin/chown/chown.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)chown.8 8.3 (Berkeley) 3/31/94 -.\" $Id: chown.8,v 1.4 1994/06/18 20:55:57 cgd Exp $ +.\" $NetBSD: chown.8,v 1.5 1997/03/06 06:26:09 mikel Exp $ .\" .Dd March 31, 1994 .Dt CHOWN 8 diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c index e04c2f7d8493..921333c3c5cc 100644 --- a/usr.sbin/chown/chown.c +++ b/usr.sbin/chown/chown.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)chown.c 8.8 (Berkeley) 4/4/94"; */ -static char *rcsid = "$Id: chown.c,v 1.7 1995/06/03 07:01:19 jtc Exp $"; +static char *rcsid = "$NetBSD: chown.c,v 1.8 1997/03/06 06:26:10 mikel Exp $"; #endif /* not lint */ #include @@ -78,11 +78,11 @@ main(argc, argv) int Hflag, Lflag, Pflag, ch, fts_options, hflag, rval; char *cp; - myname = (cp = rindex(*argv, '/')) ? cp + 1 : *argv; + myname = (cp = strrchr(*argv, '/')) ? cp + 1 : *argv; ischown = myname[2] == 'o'; Hflag = Lflag = Pflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRfh")) != EOF) + while ((ch = getopt(argc, argv, "HLPRfh")) != -1) switch (ch) { case 'H': Hflag = 1;